aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-init.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index aa0e408afcc..95eccc5c83b 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -814,7 +814,10 @@ you are such a person.")
814 ediff-odd-diff-face-Ancestor)) 814 ediff-odd-diff-face-Ancestor))
815 (copy-face 'secondary-selection face)))) 815 (copy-face 'secondary-selection face))))
816 )) 816 ))
817 817
818(or (boundp 'facemenu-unlisted-faces)
819 (setq facemenu-unlisted-faces nil))
820
818(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-A) 821(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-A)
819(defvar ediff-current-diff-face-A 822(defvar ediff-current-diff-face-A
820 (if (ediff-window-display-p) 823 (if (ediff-window-display-p)