HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk
[bpt/emacs.git]
/
lisp
/
hilit-chg.el
diff --git
a/lisp/hilit-chg.el
b/lisp/hilit-chg.el
index
0f84a04
..
859f128
100644
(file)
--- a/
lisp/hilit-chg.el
+++ b/
lisp/hilit-chg.el
@@
-1,7
+1,6
@@
;;; hilit-chg.el --- minor mode displaying buffer changes with special face
;;; hilit-chg.el --- minor mode displaying buffer changes with special face
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2011 Free Software Foundation, Inc.
;; Author: Richard Sharman <rsharman@pobox.com>
;; Keywords: faces
;; Author: Richard Sharman <rsharman@pobox.com>
;; Keywords: faces
@@
-195,8
+194,8
@@
(t (:inverse-video t)))
"Face used for highlighting changes."
:group 'highlight-changes)
(t (:inverse-video t)))
"Face used for highlighting changes."
:group 'highlight-changes)
-;; backward-compatibility alias
-
(put 'highlight-changes-face 'face-alias 'highlight-changes
)
+(define-obsolete-face-alias 'highlight-changes-face
+
'highlight-changes "22.1"
)
;; This looks pretty ugly, actually. Maybe the underline should be removed.
(defface highlight-changes-delete
;; This looks pretty ugly, actually. Maybe the underline should be removed.
(defface highlight-changes-delete
@@
-205,13
+204,11
@@
(t (:inverse-video t)))
"Face used for highlighting deletions."
:group 'highlight-changes)
(t (:inverse-video t)))
"Face used for highlighting deletions."
:group 'highlight-changes)
-;; backward-compatibility alias
-(put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
-
+(define-obsolete-face-alias 'highlight-changes-delete-face
+ 'highlight-changes-delete "22.1")
;; A (not very good) default list of colors to rotate through.
;; A (not very good) default list of colors to rotate through.
-;;
(define-obsolete-variable-alias 'highlight-changes-colours
'highlight-changes-colors "22.1")
(define-obsolete-variable-alias 'highlight-changes-colours
'highlight-changes-colors "22.1")
@@
-923,24
+920,26
@@
changes are made, so \\[highlight-changes-next-change] and
(defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b)
(defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b)
- (let ((e nil) x y) ;; e is set by function hilit-chg-get-diff-list-hk
+ ;; hilit-e,x,y are set by function hilit-chg-get-diff-list-hk.
+ (let (hilit-e hilit-x hilit-y)
(ediff-setup buf-a file-a buf-b file-b
nil nil ; buf-c file-C
'hilit-chg-get-diff-list-hk
(list (cons 'ediff-job-name 'something))
)
(ediff-setup buf-a file-a buf-b file-b
nil nil ; buf-c file-C
'hilit-chg-get-diff-list-hk
(list (cons 'ediff-job-name 'something))
)
- (ediff-with-current-buffer e (ediff-really-quit nil))
- (list
x
y)))
+ (ediff-with-current-buffer
hilit-
e (ediff-really-quit nil))
+ (list
hilit-x hilit-
y)))
(defun hilit-chg-get-diff-list-hk ()
(defun hilit-chg-get-diff-list-hk ()
- ;; x and y are dynamically bound by hilit-chg-get-diff-info
- ;; which calls this function as a hook
- (defvar x) ;; placate the byte-compiler
- (defvar y)
- (setq e (current-buffer))
+ ;; hilit-e/x/y are dynamically bound by hilit-chg-get-diff-info
+ ;; which calls this function as a hook.
+ (defvar hilit-x) ; placate the byte-compiler
+ (defvar hilit-y)
+ (defvar hilit-e)
+ (setq hilit-e (current-buffer))
(let ((n 0) extent p va vb a b)
(let ((n 0) extent p va vb a b)
- (setq
x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info
+ (setq
hilit-x nil hilit-y nil)
(while (< n ediff-number-of-differences)
(ediff-make-fine-diffs n)
(setq va (ediff-get-fine-diff-vector n 'A))
(while (< n ediff-number-of-differences)
(ediff-make-fine-diffs n)
(setq va (ediff-get-fine-diff-vector n 'A))
@@
-956,7
+955,7
@@
changes are made, so \\[highlight-changes-next-change] and
(setq extent (list (overlay-start (car p))
(overlay-end (car p))))
(setq p (cdr p))
(setq extent (list (overlay-start (car p))
(overlay-end (car p))))
(setq p (cdr p))
- (setq
x (append
x (list extent) )));; while p
+ (setq
hilit-x (append hilit-
x (list extent) )));; while p
;;
(setq vb (ediff-get-fine-diff-vector n 'B))
;; vb is a vector
;;
(setq vb (ediff-get-fine-diff-vector n 'B))
;; vb is a vector
@@
-971,7
+970,7
@@
changes are made, so \\[highlight-changes-next-change] and
(setq extent (list (overlay-start (car p))
(overlay-end (car p))))
(setq p (cdr p))
(setq extent (list (overlay-start (car p))
(overlay-end (car p))))
(setq p (cdr p))
- (setq
y (append
y (list extent) )))
+ (setq
hilit-y (append hilit-
y (list extent) )))
(setq n (1+ n)));; while
;; ediff-quit doesn't work here.
;; No point in returning a value, since this is a hook function.
(setq n (1+ n)));; while
;; ediff-quit doesn't work here.
;; No point in returning a value, since this is a hook function.
@@
-1037,5
+1036,4
@@
This is called when `global-highlight-changes-mode' is turned on."
(provide 'hilit-chg)
(provide 'hilit-chg)
-;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463
;;; hilit-chg.el ends here
;;; hilit-chg.el ends here