* vc/diff-mode.el (diff-mode-menu): diff-remove-trailing-whitespace.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8de5987567485d24a0cfddf86eb26053e88ae981..47471f508f036363bf9121e727326f6178cb8983 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-10  Dan Nicolaescu  <dann@gnu.org>
+
+       * vc/diff-mode.el (diff-mode-menu): Bind
+       diff-remove-trailing-whitespace.
+
 2012-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/lisp-mode.el (emacs-list-byte-code-comment-re): New var.

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c6a9371ea9aab37f5f77cf41cc17a3439341b306..11ec785b647349725240fc97d3f830c2f3830548 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -178,6 +178,8 @@ when editing big diffs)."
     ["Unified -> Context"      diff-unified->context
      :help "Convert unified diffs to context diffs"]
     ;;["Fixup Headers"         diff-fixup-modifs       (not buffer-read-only)]
+    ["Remove trailing whitespace" diff-remove-trailing-whitespace
+     :help "Remove trailing whitespace problems introduced by the diff"]
     ["Show trailing whitespace" whitespace-mode
      :style toggle :selected (bound-and-true-p whitespace-mode)
      :help "Show trailing whitespace in modified lines"]