From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 13 Jan 2009 13:58:25 +0000 (+0000)
Subject: (diff-mode-menu): Do not assume whitespace-mode is loaded.
X-Git-Tag: emacs-pretest-23.0.90~483
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28c6679241cc56d133d233a72a9ac0608e7771af;p=emacs.git

(diff-mode-menu): Do not assume whitespace-mode is loaded.
---

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index eb0807cc095..28ad437f15d 100644
--- 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 (and (boundp 'whitespace-mode) whitespace-mode)
      :help "Show trailing whitespace in modified lines"]
     "-----"
     ["Split hunk"		diff-split-hunk