Compare commits

..

No commits in common. "836429db1cd2fce2e37387d5fbeaacb251375763" and "98283cad2aaf165df165cc23edd7acfbfd84000a" have entirely different histories.

26
init.el
View File

@ -403,12 +403,9 @@
visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow)
history-delete-duplicates t
track-eol t
gc-cons-threshold (* 100 1024 1024) ; 100mb
gc-cons-threshold (* 100 1024 1024) ; 100mb
read-process-output-max (* 1024 1024) ; 1mb
next-error-message-highlight t
help-enable-symbol-autoload t
describe-bindings-outline t
redisplay-skip-fontification-on-input t)
next-error-message-highlight t)
(when (memq system-type '(gnu gnu/linux gnu/kfreebsd))
(setq x-wait-for-event-timeout nil))
@ -1974,9 +1971,6 @@ respectively."
:commands (moody-replace-mode-line-buffer-identification
moody-replace-vc-mode))
(use-package smiley
:init (setq smiley-style 'emoji))
;; * Dired
@ -2061,15 +2055,15 @@ respectively."
"Compare marked files in dired with ediff."
;; from: https://oremacs.com/2017/03/18/dired-ediff/
(interactive)
(let ((files (dired-get-marked-files))
(wnd (current-window-configuration)))
(lexical-let ((files (dired-get-marked-files))
(wnd (current-window-configuration)))
(if (<= (length files) 2)
(let ((file1 (car files))
(file2 (if (cdr files)
(cadr files)
(read-file-name
"file: "
(dired-dwim-target-directory)))))
(lexical-let ((file1 (car files))
(file2 (if (cdr files)
(cadr files)
(read-file-name
"file: "
(dired-dwim-target-directory)))))
(if (file-newer-than-file-p file1 file2)
(ediff-files file2 file1)
(ediff-files file1 file2))