aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Calancha2017-03-14 15:19:20 +0900
committerTino Calancha2017-03-14 15:19:20 +0900
commite39d593475300ff388cdb69c8134ad513e9310e7 (patch)
tree9466d4c21d3dce199f77e6b45f0fa7710537e785
parent84b6bc9eff770d8252fc400119c2e8fca5df2e48 (diff)
downloademacs-e39d593475300ff388cdb69c8134ad513e9310e7.tar.gz
emacs-e39d593475300ff388cdb69c8134ad513e9310e7.zip
diff-mode: Improve default faces for buffer ancestor
* lisp/vc/ediff-init.el (ediff-current-diff-Ancestor) (ediff-fine-diff-Ancestor): Use defaults consistent with faces for 'ediff-buffer-A' and 'ediff-buffer-B'.
-rw-r--r--lisp/vc/ediff-init.el36
1 files changed, 22 insertions, 14 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 0235926fbe4..535fdbfc904 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -942,13 +942,17 @@ this variable represents.")
942 942
943(defface ediff-current-diff-Ancestor 943(defface ediff-current-diff-Ancestor
944 (if (featurep 'emacs) 944 (if (featurep 'emacs)
945 '((((class color) (min-colors 88)) 945 '((((class color) (min-colors 88) (background light))
946 (:background "VioletRed")) 946 :background "#cfdeee")
947 (((class color) (min-colors 16)) 947 (((class color) (min-colors 88) (background dark))
948 (:foreground "Black" :background "VioletRed")) 948 :background "#004151")
949 (((class color)) 949 (((class color) (min-colors 16) (background light))
950 (:foreground "black" :background "magenta3")) 950 :background "#cfdeee")
951 (t (:inverse-video t))) 951 (((class color) (min-colors 16) (background dark))
952 :background "#004151")
953 (((class color))
954 (:foreground "black" :background "magenta3"))
955 (t (:inverse-video t)))
952 '((((type tty)) (:foreground "black" :background "magenta3")) 956 '((((type tty)) (:foreground "black" :background "magenta3"))
953 (((class color)) (:foreground "Black" :background "VioletRed")) 957 (((class color)) (:foreground "Black" :background "VioletRed"))
954 (t (:inverse-video t)))) 958 (t (:inverse-video t))))
@@ -1052,13 +1056,17 @@ this variable represents.")
1052 1056
1053(defface ediff-fine-diff-Ancestor 1057(defface ediff-fine-diff-Ancestor
1054 (if (featurep 'emacs) 1058 (if (featurep 'emacs)
1055 '((((class color) (min-colors 88)) 1059 '((((class color) (min-colors 88) (background light))
1056 (:background "Green")) 1060 :background "#00c5c0")
1057 (((class color) (min-colors 16)) 1061 (((class color) (min-colors 88) (background dark))
1058 (:foreground "Black" :background "Green")) 1062 :background "#009591")
1059 (((class color)) 1063 (((class color) (min-colors 16) (background light))
1060 (:foreground "red3" :background "green")) 1064 :background "#00c5c0")
1061 (t (:underline t :stipple "gray3"))) 1065 (((class color) (min-colors 16) (background dark))
1066 :background "#009591")
1067 (((class color))
1068 (:foreground "red3" :background "green"))
1069 (t (:underline t :stipple "gray3")))
1062 '((((type tty)) (:foreground "red3" :background "green")) 1070 '((((type tty)) (:foreground "red3" :background "green"))
1063 (((class color)) (:foreground "Black" :background "Green")) 1071 (((class color)) (:foreground "Black" :background "Green"))
1064 (t (:underline t :stipple "gray3")))) 1072 (t (:underline t :stipple "gray3"))))