# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1231608064 0
# Node ID 3f35938e8ea3d034d1794fecd4866927cb25a1a3
# Parent  00eb4d86697fcd69507607a0c9636395bbd5b10b
(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.

diff -r 00eb4d86697f -r 3f35938e8ea3 etc/NEWS
--- a/etc/NEWS	Sat Jan 10 13:20:18 2009 +0000
+++ b/etc/NEWS	Sat Jan 10 17:21:04 2009 +0000
@@ -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
 +++
diff -r 00eb4d86697f -r 3f35938e8ea3 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 10 13:20:18 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 10 17:21:04 2009 +0000
@@ -1,3 +1,10 @@
+2009-01-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* 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  <cyd@stupidchicken.com>
 
 	* faces.el (x-font-family-list): Remove entirely.
diff -r 00eb4d86697f -r 3f35938e8ea3 lisp/diff-mode.el
--- a/lisp/diff-mode.el	Sat Jan 10 13:20:18 2009 +0000
+++ b/lisp/diff-mode.el	Sat Jan 10 17:21:04 2009 +0000
@@ -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)