diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-10 10:43:24 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-10 10:43:24 +0000 |
| commit | 37af2dd341d91ce2bce3880ee7f3fb2bfad0fa4a (patch) | |
| tree | 017228792dc2b5109a1db84a71192abd563b6f4e /lisp/compare-w.el | |
| parent | 10853fc39e93be98900110bfa2634375279b08d4 (diff) | |
| download | emacs-37af2dd341d91ce2bce3880ee7f3fb2bfad0fa4a.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
Remove "-face" suffix from compare-windows face
2005-06-10 Miles Bader <miles@gnu.org>
* lisp/compare-w.el (compare-windows): Remove "-face" suffix from face name.
(compare-windows-face): New backward-compatibility alias for
renamed face.
(compare-windows-highlight): Use renamed compare-windows face.
Diffstat (limited to 'lisp/compare-w.el')
| -rw-r--r-- | lisp/compare-w.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/compare-w.el b/lisp/compare-w.el index c9b26a6eb5b..353c015c8af 100644 --- a/lisp/compare-w.el +++ b/lisp/compare-w.el @@ -1,6 +1,6 @@ ;;; compare-w.el --- compare text between windows for Emacs -;; Copyright (C) 1986,1989,1993,1997,2003,2004 Free Software Foundation, Inc. +;; Copyright (C) 1986,1989,1993,1997,2003,2004,2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience files @@ -116,7 +116,7 @@ and the value `((4) (4))' for horizontally split windows." :type 'boolean :group 'compare-w) -(defface compare-windows-face +(defface compare-windows '((((class color) (min-colors 88) (background light)) (:background "paleturquoise")) (((class color) (min-colors 88) (background dark)) @@ -126,6 +126,8 @@ and the value `((4) (4))' for horizontally split windows." (t (:underline t))) "Face for highlighting of compare-windows difference regions." :group 'compare-w) +;; backward-compatibility alias +(put 'compare-windows-face 'face-alias 'compare-windows) (defvar compare-windows-overlay1 nil) (defvar compare-windows-overlay2 nil) @@ -341,13 +343,13 @@ on third call it again advances points to the next difference and so on." (if compare-windows-overlay1 (move-overlay compare-windows-overlay1 beg1 end1 b1) (setq compare-windows-overlay1 (make-overlay beg1 end1 b1)) - (overlay-put compare-windows-overlay1 'face 'compare-windows-face) + (overlay-put compare-windows-overlay1 'face 'compare-windows) (overlay-put compare-windows-overlay1 'priority 1)) (overlay-put compare-windows-overlay1 'window w1) (if compare-windows-overlay2 (move-overlay compare-windows-overlay2 beg2 end2 b2) (setq compare-windows-overlay2 (make-overlay beg2 end2 b2)) - (overlay-put compare-windows-overlay2 'face 'compare-windows-face) + (overlay-put compare-windows-overlay2 'face 'compare-windows) (overlay-put compare-windows-overlay2 'priority 1)) (overlay-put compare-windows-overlay2 'window w2) ;; Remove highlighting before next command is executed |