Mercurial > emacs

comparison lisp/ediff-init.el @ 14534:3c38a5112cb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure `facemenu-unlisted-faces' is bound.
author Richard M. Stallman <rms@gnu.org>
date Sat, 10 Feb 1996 05:14:34 +0000
parents 1315dc695abe
children c768f6d7daaa
comparison
equal deleted inserted replaced
14533:2eb6c03dcb86 14534:3c38a5112cb6
812 ediff-even-diff-face-C ediff-odd-diff-face-C 812 ediff-even-diff-face-C ediff-odd-diff-face-C
813 ediff-even-diff-face-Ancestor 813 ediff-even-diff-face-Ancestor
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)
821 (progn 824 (progn
822 (make-face 'ediff-current-diff-face-A) 825 (make-face 'ediff-current-diff-face-A)