diff -r c4ec990891d8 -r 0160e2f997ee .emacs-my --- a/.emacs-my Sun Jun 17 22:50:13 2018 +0300 +++ b/.emacs-my Wed Jul 11 14:49:36 2018 +0300 @@ -513,7 +513,7 @@ ;; For (display-time-world). (setq display-time-world-time-format "%A %d %B %R %z %Z") -(when (boundp 'display-time-world-list) ; Absent in Emacs 22. +(when (and (boundp 'display-time-world-list) (not (eq t display-time-world-list))) ; Missing in Emacs 22. (mapc (lambda (el) (add-to-list 'display-time-world-list el)) '(("EET" "UTC+2, Eastern European Time") ("EST" "UTC-5, Eastern Standard Time, New York") @@ -2520,11 +2520,11 @@ ;; (defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1)) ;; (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on) -(when window-system +(when (and window-system (< emacs-major-version 26)) (my--eval-after-load diff-mode - (set-face-foreground 'diff-added-face "DarkGreen") - (set-face-foreground 'diff-removed-face "DarkRed") - (set-face-background 'diff-refine-change "LightBlue1"))) + (set-face-foreground 'diff-added "DarkGreen") + (set-face-foreground 'diff-removed "DarkRed") + (set-face-background 'diff-refine-changed "LightBlue1"))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil")