/[emacs]/emacs/lisp/compare-w.el
ViewVC logotype

Diff of /emacs/lisp/compare-w.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26 by jurta, Sun Nov 28 07:56:01 2004 UTC revision 1.27 by miles, Fri Jun 10 10:43:24 2005 UTC
# Line 1  Line 1 
1  ;;; compare-w.el --- compare text between windows for Emacs  ;;; compare-w.el --- compare text between windows for Emacs
2    
3  ;; 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.
4    
5  ;; Maintainer: FSF  ;; Maintainer: FSF
6  ;; Keywords: convenience files  ;; Keywords: convenience files
# Line 116  and the value `((4) (4))' for horizontal Line 116  and the value `((4) (4))' for horizontal
116    :type 'boolean    :type 'boolean
117    :group 'compare-w)    :group 'compare-w)
118    
119  (defface compare-windows-face  (defface compare-windows
120    '((((class color) (min-colors 88) (background light))    '((((class color) (min-colors 88) (background light))
121       (:background "paleturquoise"))       (:background "paleturquoise"))
122      (((class color) (min-colors 88) (background dark))      (((class color) (min-colors 88) (background dark))
# Line 126  and the value `((4) (4))' for horizontal Line 126  and the value `((4) (4))' for horizontal
126      (t (:underline t)))      (t (:underline t)))
127    "Face for highlighting of compare-windows difference regions."    "Face for highlighting of compare-windows difference regions."
128    :group 'compare-w)    :group 'compare-w)
129    ;; backward-compatibility alias
130    (put 'compare-windows-face 'face-alias 'compare-windows)
131    
132  (defvar compare-windows-overlay1 nil)  (defvar compare-windows-overlay1 nil)
133  (defvar compare-windows-overlay2 nil)  (defvar compare-windows-overlay2 nil)
# Line 341  on third call it again advances points t Line 343  on third call it again advances points t
343      (if compare-windows-overlay1      (if compare-windows-overlay1
344          (move-overlay compare-windows-overlay1 beg1 end1 b1)          (move-overlay compare-windows-overlay1 beg1 end1 b1)
345        (setq compare-windows-overlay1 (make-overlay beg1 end1 b1))        (setq compare-windows-overlay1 (make-overlay beg1 end1 b1))
346        (overlay-put compare-windows-overlay1 'face 'compare-windows-face)        (overlay-put compare-windows-overlay1 'face 'compare-windows)
347        (overlay-put compare-windows-overlay1 'priority 1))        (overlay-put compare-windows-overlay1 'priority 1))
348      (overlay-put compare-windows-overlay1 'window w1)      (overlay-put compare-windows-overlay1 'window w1)
349      (if compare-windows-overlay2      (if compare-windows-overlay2
350          (move-overlay compare-windows-overlay2 beg2 end2 b2)          (move-overlay compare-windows-overlay2 beg2 end2 b2)
351        (setq compare-windows-overlay2 (make-overlay beg2 end2 b2))        (setq compare-windows-overlay2 (make-overlay beg2 end2 b2))
352        (overlay-put compare-windows-overlay2 'face 'compare-windows-face)        (overlay-put compare-windows-overlay2 'face 'compare-windows)
353        (overlay-put compare-windows-overlay2 'priority 1))        (overlay-put compare-windows-overlay2 'priority 1))
354      (overlay-put compare-windows-overlay2 'window w2)      (overlay-put compare-windows-overlay2 'window w2)
355      ;; Remove highlighting before next command is executed      ;; Remove highlighting before next command is executed

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26