Merge changes from emacs-23

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

diff --git a/.dir-locals.el b/.dir-locals.el
dissimilarity index 85%
index 377f0de..4da890f 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,7 +1,13 @@
-((nil . ((indent-tabs-mode . t)
-         (tab-width . 8)
-         (fill-column . 80)))
- (c-mode . ((c-file-style . "GNU")))
- (change-log-mode . ((add-log-time-zone-rule . t)))
- ("lisp/mail/pmail*"
-  . ((nil . ((change-log-default-name . "ChangeLog.pmail"))))))
+((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))))