Fix regression introduced by July 10 filelock.c patch.

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

diff --git a/.dir-locals.el b/.dir-locals.el
index 86410cc8f40f7d609497922c75f225a96f539f1c..5bee88267c851f28f8e6e8f5d1117d24ecdc55ba 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,11 +1,13 @@
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
-         (fill-column . 79)))
+         (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")))
+ (objc-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")))
+                    "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
+                   (log-edit-font-lock-gnu-style . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
                     (fill-column . 74)
                     (bug-reference-url-format . "http://debbugs.gnu.org/%s")