diff lisp/hilit-chg.el @ 90295:4b3d39451150

Revision: [e-mail]/emacs--unicode--0--patch-14 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 58-65) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 22-28) - Update from CVS - Merge from emacs--devo--0 - Update from CVS: lisp/gnus.el: Remove bogus comment.

--- a/lisp/hilit-chg.el	Wed Feb 08 04:26:44 2006 +0000
+++ b/lisp/hilit-chg.el	Sat Feb 11 00:11:19 2006 +0000
@@ -521,7 +521,7 @@
 This allows you to manually remove highlighting from uninteresting changes."
   (interactive "r")
   (let ((after-change-functions nil))
-    (remove-text-properties beg end  '(hilit-chg nil))
+    (remove-text-properties beg end '(hilit-chg nil))
     (hilit-chg-fixup beg end)))
 
 (defun hilit-chg-set-face-on-change (beg end leng-before
@@ -662,7 +662,7 @@
 	      ;; an argument is given
 	      ((eq arg 'active)
 	       'active)
-	      ((eq arg  'passive)
+	      ((eq arg 'passive)
 	       'passive)
 	      ((> (prefix-numeric-value arg) 0)
 	       'active)
@@ -673,7 +673,6 @@
 	(if new-highlight-changes-mode
 	    ;; mode is turned on -- but may be passive
 	    (progn
-	      (add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
 	      (hilit-chg-set new-highlight-changes-mode)
 	      (or was-on
 		  ;; run highlight-changes-enable-hook once
@@ -960,9 +959,9 @@
   ;; which calls this function as a hook
   (defvar x)  ;; placate the byte-compiler
   (defvar y)
-  (setq  e (current-buffer))
+  (setq e (current-buffer))
   (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 x nil y nil)    ;; x and y are bound by hilit-chg-get-diff-info
     (while (< n ediff-number-of-differences)
       (ediff-make-fine-diffs n)
       (setq va (ediff-get-fine-diff-vector n 'A))
@@ -1085,7 +1084,7 @@
       (progn
 	(if (eq arg 'active)
 	    (setq highlight-changes-global-initial-state 'active)
-	  (if (eq arg  'passive)
+	  (if (eq arg 'passive)
 	      (setq highlight-changes-global-initial-state 'passive)))
 	(setq global-highlight-changes t)
 	(message "Turning ON Global Highlight Changes mode in %s state"
@@ -1131,7 +1130,7 @@
 	       (memq major-mode highlight-changes-global-modes)))
 	    (t
 	     (and
-	      (not (string-match "^[ *]"  (buffer-name)))
+	      (not (string-match "^[ *]" (buffer-name)))
 	      (buffer-file-name))))
 	  (progn
 	    (hilit-chg-set value)
@@ -1146,14 +1145,15 @@
 
 
 (defun hilit-chg-update-all-buffers (value)
-  (mapcar
+  (mapc
    (function (lambda (buffer)
 	       (with-current-buffer buffer
 		 (if value
 		     (hilit-chg-turn-on-maybe value)
 		   (hilit-chg-turn-off-maybe))
 		 )))
-   (buffer-list)))
+   (buffer-list))
+  nil)
 
 ;;;; Desktop support.
 
@@ -1165,6 +1165,8 @@
 (add-to-list 'desktop-minor-mode-handlers
              '(highlight-changes-mode . hilit-chg-desktop-restore))
 
+(add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
+
 ;; ===================== debug ==================
 ;; For debug & test use:
 ;;