Merge from emacs-23 branch

[bpt/emacs.git] / .dir-locals.el

diff --git a/.dir-locals.el b/.dir-locals.el
index 9b90757..f098f3e 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,4 +1,5 @@
 ((nil . ((tab-width . 8)
+         (sentence-end-double-space . t)
          (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")))
  ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
@@ -8,5 +9,5 @@
  (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))))