Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm@gnu.org

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

diff --git a/.dir-locals.el b/.dir-locals.el
index 12b8556..4da890f 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,10 +1,13 @@
 ((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.
+ ;; See admin/notes/bugtracker.
+ (log-edit-mode . ((log-edit-rewrite-fixes
+                    "[ \n](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)))
  (diff-mode . ((mode . whitespace))))
-
-;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd