Merge from emacs-24

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

diff --git a/.dir-locals.el b/.dir-locals.el
index 471f74d..5bee882 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,6 +2,7 @@
          (sentence-end-double-space . t)
          (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