[Emacs-diffs] Changes to emacs/lisp/compare-w.el

[Miles Bader]

Index: emacs/lisp/compare-w.el
diff -c emacs/lisp/compare-w.el:1.26 emacs/lisp/compare-w.el:1.27
*** emacs/lisp/compare-w.el:1.26        Sun Nov 28 07:56:01 2004
--- emacs/lisp/compare-w.el     Fri Jun 10 10:43:24 2005
***************
*** 1,6 ****
  ;;; compare-w.el --- compare text between windows for Emacs
  
! ;; Copyright (C) 1986,1989,1993,1997,2003,2004 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: convenience files
--- 1,6 ----
  ;;; compare-w.el --- compare text between windows for Emacs
  
! ;; Copyright (C) 1986,1989,1993,1997,2003,2004,2005 Free Software Foundation, 
Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: convenience files
***************
*** 116,122 ****
    :type 'boolean
    :group 'compare-w)
  
! (defface compare-windows-face
    '((((class color) (min-colors 88) (background light))
       (:background "paleturquoise"))
      (((class color) (min-colors 88) (background dark))
--- 116,122 ----
    :type 'boolean
    :group 'compare-w)
  
! (defface compare-windows
    '((((class color) (min-colors 88) (background light))
       (:background "paleturquoise"))
      (((class color) (min-colors 88) (background dark))
***************
*** 126,131 ****
--- 126,133 ----
      (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,353 ****
      (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 '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 'priority 1))
      (overlay-put compare-windows-overlay2 'window w2)
      ;; Remove highlighting before next command is executed
--- 343,355 ----
      (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)
        (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)
        (overlay-put compare-windows-overlay2 'priority 1))
      (overlay-put compare-windows-overlay2 'window w2)
      ;; Remove highlighting before next command is executed