diff options
| author | Richard M. Stallman | 1996-02-10 05:14:34 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-02-10 05:14:34 +0000 |
| commit | 36d57fa96f052a2f00a5be749a9dd3a6e3bfdc27 (patch) | |
| tree | c198ba877e8e6d85f7116af038ad7343f876269b | |
| parent | 2a74bdc1b5e94c02a20b4c9b1090c1adad765e88 (diff) | |
| download | emacs-36d57fa96f052a2f00a5be749a9dd3a6e3bfdc27.tar.gz emacs-36d57fa96f052a2f00a5be749a9dd3a6e3bfdc27.zip | |
Make sure `facemenu-unlisted-faces' is bound.
| -rw-r--r-- | lisp/ediff-init.el | 5 |
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) |