HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2012 to FSF copyright years for Emacs files
[bpt/emacs.git]
/
lisp
/
hilit-chg.el
diff --git
a/lisp/hilit-chg.el
b/lisp/hilit-chg.el
index
859f128
..
0970ece
100644
(file)
--- a/
lisp/hilit-chg.el
+++ b/
lisp/hilit-chg.el
@@
-1,6
+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-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-201
2
Free Software Foundation, Inc.
;; Author: Richard Sharman <rsharman@pobox.com>
;; Keywords: faces
;; Author: Richard Sharman <rsharman@pobox.com>
;; Keywords: faces
@@
-326,14
+326,15
@@
remove it from existing buffers."
;;;###autoload
(define-minor-mode highlight-changes-mode
;;;###autoload
(define-minor-mode highlight-changes-mode
- "Toggle Highlight Changes mode.
+ "Toggle highlighting changes in this buffer (Highlight Changes mode).
+With a prefix argument ARG, enable Highlight Changes mode if ARG
+is positive, and disable it otherwise. If called from Lisp,
+enable the mode if ARG is omitted or nil.
-With ARG, turn Highlight Changes mode on if and only if arg is positive.
-
-In Highlight Changes mode changes are recorded with a text property.
-Normally they are displayed in a distinctive face, but command
-\\[highlight-changes-visible-mode] can be used to toggles this
-on and off.
+When Highlight Changes is enabled, changes are marked with a text
+property. Normally they are displayed in a distinctive face, but
+command \\[highlight-changes-visible-mode] can be used to toggles
+this on and off.
Other functions for buffers in this mode include:
\\[highlight-changes-next-change] - move point to beginning of next change
Other functions for buffers in this mode include:
\\[highlight-changes-next-change] - move point to beginning of next change
@@
-366,14
+367,17
@@
buffer with the contents of a file
;;;###autoload
(define-minor-mode highlight-changes-visible-mode
;;;###autoload
(define-minor-mode highlight-changes-visible-mode
- "Toggle visiblility of changes when buffer is in Highlight Changes mode.
+ "Toggle visibility of highlighting due to Highlight Changes mode.
+With a prefix argument ARG, enable Highlight Changes Visible mode
+if ARG is positive, and disable it otherwise. If called from
+Lisp, enable the mode if ARG is omitted or nil.
-This mode only has an effect when Highlight Changes mode is on.
-
It allows toggling between whether or not
the changed text is displayed
+Highlight Changes Visible mode only has an effect when Highlight
+
Changes mode is on. When enabled,
the changed text is displayed
in a distinctive face.
The default value can be customized with variable
in a distinctive face.
The default value can be customized with variable
-`highlight-changes-visibility-initial-state'
+`highlight-changes-visibility-initial-state'
.
This command does not itself set highlight-changes mode."
This command does not itself set highlight-changes mode."
@@
-385,7
+389,7
@@
This command does not itself set highlight-changes mode."
)
)
-(defun hilit-chg-cust-fix-changes-face-list (w wc &optional event)
+(defun hilit-chg-cust-fix-changes-face-list (w
_
wc &optional event)
;; When customization function `highlight-changes-face-list' inserts a new
;; face it uses the default face. We don't want the user to modify this
;; face, so we rename the faces in the list on an insert. The rename is
;; When customization function `highlight-changes-face-list' inserts a new
;; face it uses the default face. We don't want the user to modify this
;; face, so we rename the faces in the list on an insert. The rename is
@@
-476,7
+480,7
@@
This is the opposite of `hilit-chg-hide-changes'."
(defun hilit-chg-make-ov (prop start end)
(or prop
(error "hilit-chg-make-ov: prop is nil"))
(defun hilit-chg-make-ov (prop start end)
(or prop
(error "hilit-chg-make-ov: prop is nil"))
- ;; For the region create overlays with a distincive face
+ ;; For the region create overlays with a distinc
t
ive face
;; and the text property 'hilit-chg.
(let ((ov (make-overlay start end))
(face (if (eq prop 'hilit-chg-delete)
;; and the text property 'hilit-chg.
(let ((ov (make-overlay start end))
(face (if (eq prop 'hilit-chg-delete)
@@
-557,9
+561,9
@@
This allows you to manually remove highlighting from uninteresting changes."
;; otherwise an undone change shows up as changed. While the properties
;; are automatically restored by undo, we must fix up the overlay.
(save-match-data
;; otherwise an undone change shows up as changed. While the properties
;; are automatically restored by undo, we must fix up the overlay.
(save-match-data
- (let (
(beg-decr 1) (end-in
cr 1)
-
(type 'hilit-chg
)
-
old
)
+ (let (
;;(beg-de
cr 1)
+
(end-incr 1
)
+
(type 'hilit-chg)
)
(if undo-in-progress
(if (and highlight-changes-mode
highlight-changes-visible-mode)
(if undo-in-progress
(if (and highlight-changes-mode
highlight-changes-visible-mode)
@@
-632,7
+636,7
@@
This removes all saved change information."
(highlight-save-buffer-state
(hilit-chg-hide-changes)
(hilit-chg-map-changes
(highlight-save-buffer-state
(hilit-chg-hide-changes)
(hilit-chg-map-changes
- (lambda (prop start stop)
+ (lambda (
_
prop start stop)
(remove-text-properties start stop '(hilit-chg nil)))))
(setq highlight-changes-mode nil)
(force-mode-line-update)))
(remove-text-properties start stop '(hilit-chg nil)))))
(setq highlight-changes-mode nil)
(force-mode-line-update)))
@@
-911,8
+915,7
@@
changes are made, so \\[highlight-changes-next-change] and
(file-a (buffer-file-name))
(existing-buf (get-file-buffer file-b))
(buf-b (or existing-buf
(file-a (buffer-file-name))
(existing-buf (get-file-buffer file-b))
(buf-b (or existing-buf
- (find-file-noselect file-b)))
- (buf-b-read-only (with-current-buffer buf-b buffer-read-only)))
+ (find-file-noselect file-b))))
(highlight-markup-buffers buf-a file-a buf-b file-b (not existing-buf))
(unless existing-buf
(kill-buffer buf-b))
(highlight-markup-buffers buf-a file-a buf-b file-b (not existing-buf))
(unless existing-buf
(kill-buffer buf-b))
@@
-1026,9
+1029,8
@@
This is called when `global-highlight-changes-mode' is turned on."
;; (defun hilit-chg-debug-show (&optional beg end)
;; (interactive)
;; (message "--- hilit-chg-debug-show ---")
;; (defun hilit-chg-debug-show (&optional beg end)
;; (interactive)
;; (message "--- hilit-chg-debug-show ---")
-;; (hilit-chg-map-changes '(lambda (prop start end)
-;; (message "%d-%d: %s" start end prop)
-;; )
+;; (hilit-chg-map-changes (lambda (prop start end)
+;; (message "%d-%d: %s" start end prop))
;; beg end
;; ))
;;
;; beg end
;; ))
;;