summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-01-13 13:58:25 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-01-13 13:58:25 +0000
commit28c6679241cc56d133d233a72a9ac0608e7771af (patch)
tree1bf0b45b03f8d6d688aeaef2c817a527ffa1bca9 /lisp/diff-mode.el
parent8fba79577d10a6ba441589f76d8eee6525038482 (diff)
downloademacs-28c6679241cc56d133d233a72a9ac0608e7771af.tar.gz
emacs-28c6679241cc56d133d233a72a9ac0608e7771af.tar.bz2
emacs-28c6679241cc56d133d233a72a9ac0608e7771af.zip
(diff-mode-menu): Do not assume whitespace-mode is loaded.
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r--lisp/diff-mode.el2
1 files changed, 1 insertions, 1 deletions
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