Merge from gnulib.

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

diff --git a/.dir-locals.el b/.dir-locals.el
index 1d934e8e66f8b2b64ddfce267f99ad0169aded77..86410cc8f40f7d609497922c75f225a96f539f1c 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,9 +1,13 @@
 ((nil . ((tab-width . 8)
-         (fill-column . 70)))
+         (sentence-end-double-space . t)
+         (fill-column . 79)))
  (c-mode . ((c-file-style . "GNU")))
+ ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
+ ;; See admin/notes/bugtracker.
+ (log-edit-mode . ((log-edit-rewrite-fixes
+                    " (bug#\\([0-9]+\\))" . "debbugs:\\1")))
  (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))))