Merge changes from emacs-23 branch

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

diff --git a/.dir-locals.el b/.dir-locals.el
index f12dbf7..f098f3e 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,6 +2,10 @@
          (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
+                    " (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")