[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/diff-mode.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/01/10 17:21:14

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog diff-mode.el 

Log message:
        (diff-show-trailing-whitespaces): Remove function.
        Move setting up whitepace-mode ...
        (diff-mode): ... here.
        (diff-mode-menu): Add a menu entry for showing trailing whitespace.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.1974&r2=1.1975
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15083&r2=1.15084
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/diff-mode.el?cvsroot=emacs&r1=1.153&r2=1.154

Patches:
Index: etc/NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/NEWS,v
retrieving revision 1.1974
retrieving revision 1.1975
diff -u -b -r1.1974 -r1.1975
--- etc/NEWS    10 Jan 2009 12:57:20 -0000      1.1974
+++ etc/NEWS    10 Jan 2009 17:21:04 -0000      1.1975
@@ -781,8 +781,8 @@
 buffer and tries to create ChangeLog entries for each change.
 It is bound to `C-x 4 A'.
 +++
-*** The new function `diff-show-trailing-whitespaces' shows
-trailing whitespace problems in the modified lines of a diff buffer.
+*** Turning on `whitespace-mode' in a diff buffer will show trailing
+whitespace problems in the modified lines.
 
 ** Dired
 +++

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15083
retrieving revision 1.15084
diff -u -b -r1.15083 -r1.15084
--- lisp/ChangeLog      10 Jan 2009 13:16:38 -0000      1.15083
+++ lisp/ChangeLog      10 Jan 2009 17:21:08 -0000      1.15084
@@ -1,3 +1,10 @@
+2009-01-10  Dan Nicolaescu  <address@hidden>
+
+       * diff-mode.el (diff-show-trailing-whitespaces): Remove function.
+       Move setting up whitepace-mode ...
+       (diff-mode): ... here.
+       (diff-mode-menu): Add a menu entry for showing trailing whitespace.
+
 2009-01-10  Chong Yidong  <address@hidden>
 
        * faces.el (x-font-family-list): Remove entirely.

Index: lisp/diff-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- lisp/diff-mode.el   3 Jan 2009 03:31:54 -0000       1.153
+++ lisp/diff-mode.el   10 Jan 2009 17:21:13 -0000      1.154
@@ -183,6 +183,9 @@
     ["Unified -> Context"      diff-unified->context
      :help "Convert unified diffs to context diffs"]
     ;;["Fixup Headers"         diff-fixup-modifs       (not buffer-read-only)]
+    ["Show trailing whitespace" whitespace-mode
+     :style toggle :selected whitespace-mode
+     :help "Show trailing whitespace in modified lines"]
     "-----"
     ["Split hunk"              diff-split-hunk
      :active (diff-splittable-p)
@@ -1264,6 +1267,12 @@
   (set (make-local-variable 'end-of-defun-function)
        'diff-end-of-file)
 
+  ;; Set up `whitespace-mode' so that turning it on will show trailing
+  ;; whitespace problems on the modified lines of the diff.
+  (set (make-local-variable 'whitespace-style) '(trailing))
+  (set (make-local-variable 'whitespace-trailing-regexp)
+       "^[-\+!<>].*?\\([\t ]+\\)$")
+
   (setq buffer-read-only diff-default-read-only)
   ;; setup change hooks
   (if (not diff-update-on-the-fly)
@@ -1885,13 +1894,6 @@
         ;; When there's no more hunks, diff-hunk-next signals an error.
        (error nil)))))
 
-(defun diff-show-trailing-whitespaces ()
-  "Show trailing whitespaces in modified lines for diff-mode."
-  (interactive)
-  (let ((whitespace-style '(trailing))
-        (whitespace-trailing-regexp "^[-+!<>].*?\\([\t ]+\\)$"))
-    (whitespace-mode 1)))     ; display trailing whitespace in diff buffer
-
 ;; provide the package
 (provide 'diff-mode)