Merge from emacs-23

[gnu-emacs] / .dir-locals.el

diff --git a/.dir-locals.el b/.dir-locals.el
index 3ab6809ffb86448e0bd5843539c5c5317e37fe5b..873f733854d5f176975537c68a8345a31a09f73f 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")))
  (log-edit-mode . ((log-edit-rewrite-fixes
@@ -6,6 +7,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))))
-
-;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd
+                    (mode . bug-reference)))
+ (diff-mode . ((mode . whitespace))))