summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-02-10 05:14:34 +0000
committerRichard M. Stallman <rms@gnu.org>1996-02-10 05:14:34 +0000
commit36d57fa96f052a2f00a5be749a9dd3a6e3bfdc27 (patch)
treec198ba877e8e6d85f7116af038ad7343f876269b /lisp/ediff-init.el
parent2a74bdc1b5e94c02a20b4c9b1090c1adad765e88 (diff)
downloademacs-36d57fa96f052a2f00a5be749a9dd3a6e3bfdc27.tar.gz
Make sure `facemenu-unlisted-faces' is bound.
Diffstat (limited to 'lisp/ediff-init.el')
-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.")
ediff-odd-diff-face-Ancestor))
(copy-face 'secondary-selection face))))
))
-
+
+(or (boundp 'facemenu-unlisted-faces)
+ (setq facemenu-unlisted-faces nil))
+
(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-A)
(defvar ediff-current-diff-face-A
(if (ediff-window-display-p)