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