summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-03-19 02:46:08 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-03-19 02:46:08 -0700
commita3ab37b334b5de7fc55423aff0d174b3edb52a81 (patch)
treedc26435ce3a6b45fae38583e4a8c477ba34a741c
parent3c95bbb62157210d10c983840bb725b3a8b9be12 (diff)
downloademacs-a3ab37b334b5de7fc55423aff0d174b3edb52a81.tar.gz
* .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
-rw-r--r--.dir-locals.el3
-rw-r--r--ChangeLog4
2 files changed, 6 insertions, 1 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 1d934e8e66f..12b85561ee8 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -4,6 +4,7 @@
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
(bug-reference-url-format . "http://debbugs.gnu.org/%s")
- (mode . bug-reference))))
+ (mode . bug-reference)))
+ (diff-mode . ((mode . whitespace))))
;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd
diff --git a/ChangeLog b/ChangeLog
index 94af13021e0..1d7c4d423e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-19 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
+
2010-03-19 Glenn Morris <rgm@gnu.org>
* configure.in (HAVE_LIBNCURSES): Add a description to make autoheader