aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/diff-mode.el
diff options
context:
space:
mode:
authorJoakim Verona2012-09-11 17:18:45 +0200
committerJoakim Verona2012-09-11 17:18:45 +0200
commit0cc36550df4f355a1b46e944fc65e533ff0df90e (patch)
tree100e4130dffa88423b6430c2814f740007b72269 /lisp/vc/diff-mode.el
parentb035a30e5cd2f34fedc04c253eeb5a11afed8145 (diff)
parent96d0357142bf277e6eb4d957a59b2c655034e2b7 (diff)
downloademacs-0cc36550df4f355a1b46e944fc65e533ff0df90e.tar.gz
emacs-0cc36550df4f355a1b46e944fc65e533ff0df90e.zip
upstream
Diffstat (limited to 'lisp/vc/diff-mode.el')
-rw-r--r--lisp/vc/diff-mode.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c6a9371ea9a..11ec785b647 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -178,6 +178,8 @@ when editing big diffs)."
178 ["Unified -> Context" diff-unified->context 178 ["Unified -> Context" diff-unified->context
179 :help "Convert unified diffs to context diffs"] 179 :help "Convert unified diffs to context diffs"]
180 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)] 180 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
181 ["Remove trailing whitespace" diff-remove-trailing-whitespace
182 :help "Remove trailing whitespace problems introduced by the diff"]
181 ["Show trailing whitespace" whitespace-mode 183 ["Show trailing whitespace" whitespace-mode
182 :style toggle :selected (bound-and-true-p whitespace-mode) 184 :style toggle :selected (bound-and-true-p whitespace-mode)
183 :help "Show trailing whitespace in modified lines"] 185 :help "Show trailing whitespace in modified lines"]