From: Miles Bader <miles@gnu.org>
Date: Fri, 10 Jun 2005 10:43:24 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
X-Git-Tag: emacs-pretest-22.0.90~9126
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37af2dd341d91ce2bce3880ee7f3fb2bfad0fa4a;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8feae6eb7e1..7b1223f6762 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2005-06-10  Miles Bader  <miles@gnu.org>
 
+	* 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.
+
 	* strokes.el (strokes-char): Remove "-face" suffix from face name.
 	(strokes-char-face): New backward-compatibility alias for renamed face.
 	(strokes-encode-buffer): Use renamed strokes-char face.
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