Merge branch 'master' into cairo

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

diff --git a/.dir-locals.el b/.dir-locals.el
index f098f3e74601d6a6fc2c0806b267ce3f9454bd7e..5e73e0d9acdfa6bde25ee2e9c3244d2a8dda858a 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,10 +2,11 @@
          (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.
+ (objc-mode . ((c-file-style . "GNU")))
  (log-edit-mode . ((log-edit-rewrite-fixes
-                    " (bug#\\([0-9]+\\))" . "debbugs:\\1")))
+                    "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
+                   (log-edit-font-lock-gnu-style . t)
+                   (log-edit-setup-add-author . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
                     (fill-column . 74)
                     (bug-reference-url-format . "http://debbugs.gnu.org/%s")