(doc-view-scroll-up-or-next-page)

[gnu-emacs] / lisp / diff-mode.el

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 7eddf3b37e7fa5daddbc2aef1608cfa7526324b6..a83200d8982835a0e27194c51a7d889bd6bf0abc 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -184,7 +184,7 @@ when editing big diffs)."
      :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
+     :style toggle :selected (bound-and-true-p whitespace-mode)
      :help "Show trailing whitespace in modified lines"]
     "-----"
     ["Split hunk"              diff-split-hunk
@@ -1230,6 +1230,9 @@ See `after-change-functions' for the meaning of BEG, END and LEN."
   (diff-hunk-next arg)
   (diff-goto-source))
 
+(defvar whitespace-style)
+(defvar whitespace-trailing-regexp)
+
 ;;;###autoload
 (define-derived-mode diff-mode fundamental-mode "Diff"
   "Major mode for viewing/editing context diffs.