aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2006-02-01 11:25:52 +0000
committerJuanma Barranquero2006-02-01 11:25:52 +0000
commitea56cdf1b7716fca51374a5471adbb862d9a31f1 (patch)
tree571beccec078b369b80d0083a4f38a9bf6430ec9
parent2b3726c0876798402954c345dc5eea6fd185396d (diff)
downloademacs-ea56cdf1b7716fca51374a5471adbb862d9a31f1.tar.gz
emacs-ea56cdf1b7716fca51374a5471adbb862d9a31f1.zip
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Doc fixes. (highlight-changes-global-modes, global-highlight-changes): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/hilit-chg.el14
2 files changed, 14 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69b312e21ba..0d51f0f1d67 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12006-02-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * hilit-chg.el (highlight-changes-initial-state)
4 (highlight-changes-global-initial-state): Doc fixes.
5 (highlight-changes-global-modes, global-highlight-changes):
6 Fix typos in docstrings.
7
12006-02-01 Kim F. Storm <storm@cua.dk> 82006-02-01 Kim F. Storm <storm@cua.dk>
2 9
3 * emulation/cua-base.el (cua-mode): Mention that CUA enables 10 * emulation/cua-base.el (cua-mode): Mention that CUA enables
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 7011ff37dd3..55eafb5c617 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -261,15 +261,15 @@ colors then use this, if you want fancier faces then set
261;; active or passive mode? 261;; active or passive mode?
262;; 262;;
263(defcustom highlight-changes-initial-state 'active 263(defcustom highlight-changes-initial-state 'active
264 "*What state (active or passive) `highlight-changes' should start in. 264 "*What state (active or passive) Highlight Changes mode should start in.
265This is used when `highlight-changes' is called with no argument. 265This is used when `highlight-changes-mode' is called with no argument.
266This variable must be set to one of the symbols `active' or `passive'." 266This variable must be set to one of the symbols `active' or `passive'."
267 :type '(choice (const :tag "Active" active) 267 :type '(choice (const :tag "Active" active)
268 (const :tag "Passive" passive)) 268 (const :tag "Passive" passive))
269 :group 'highlight-changes) 269 :group 'highlight-changes)
270 270
271(defcustom highlight-changes-global-initial-state 'passive 271(defcustom highlight-changes-global-initial-state 'passive
272 "*What state `global-highlight-changes' should start in. 272 "*What state global Highlight Changes mode should start in.
273This is used if `global-highlight-changes' is called with no argument. 273This is used if `global-highlight-changes' is called with no argument.
274This variable must be set to either `active' or `passive'." 274This variable must be set to either `active' or `passive'."
275 :type '(choice (const :tag "Active" active) 275 :type '(choice (const :tag "Active" active)
@@ -309,7 +309,7 @@ its name does not begin with ` ' or `*'.
309A value of nil means no buffers are suitable for `global-highlight-changes' 309A value of nil means no buffers are suitable for `global-highlight-changes'
310\(effectively disabling the mode). 310\(effectively disabling the mode).
311 311
312Examples: 312Example:
313 (c-mode c++-mode) 313 (c-mode c++-mode)
314means that Highlight Changes mode is turned on for buffers in C and C++ 314means that Highlight Changes mode is turned on for buffers in C and C++
315modes only." 315modes only."
@@ -366,7 +366,7 @@ remove it from existing buffers."
366 (copy-face 'highlight-changes new-name) 366 (copy-face 'highlight-changes new-name)
367 (copy-face old-name new-name) 367 (copy-face old-name new-name)
368 )) 368 ))
369 (setq new-list (append (list new-name) new-list)) 369 (setq new-list (append (list new-name) new-list))
370 (setq n (1- n)) 370 (setq n (1- n))
371 (setq p (cdr p))) 371 (setq p (cdr p)))
372 (if (equal new-list (widget-value w)) 372 (if (equal new-list (widget-value w))
@@ -419,7 +419,7 @@ Otherwise, this list will be constructed when needed from
419 419
420;;; Functions... 420;;; Functions...
421 421
422(defun hilit-chg-map-changes (func &optional start-position end-position) 422(defun hilit-chg-map-changes (func &optional start-position end-position)
423 "Call function FUNC for each region used by Highlight Changes mode." 423 "Call function FUNC for each region used by Highlight Changes mode."
424 ;; if start-position is nil, (point-min) is used 424 ;; if start-position is nil, (point-min) is used
425 ;; if end-position is nil, (point-max) is used 425 ;; if end-position is nil, (point-max) is used
@@ -1048,7 +1048,7 @@ changes are made, so \\[highlight-changes-next-change] and
1048When called interactively: 1048When called interactively:
1049- if no prefix, toggle global Highlight Changes mode on or off 1049- if no prefix, toggle global Highlight Changes mode on or off
1050- if called with a positive prefix (or just C-u) turn it on in active mode 1050- if called with a positive prefix (or just C-u) turn it on in active mode
1051- if called with a zero prefix turn it on in passive mode 1051- if called with a zero prefix turn it on in passive mode
1052- if called with a negative prefix turn it off 1052- if called with a negative prefix turn it off
1053 1053
1054When called from a program: 1054When called from a program: