From: Alan Mackenzie <acm@muc.de>
Date: Sat, 7 May 2016 20:28:18 +0000 (+0000)
Subject: Revert change 8e4595a... due to annoyance it causes the development team.
X-Git-Tag: emacs-26.0.90~1983
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ac39b069919bf71e614202aa96194c86934988c;p=emacs.git

Revert change 8e4595a... due to annoyance it causes the development team.

Change 8e4595a438fe85dd109756886cdeaeea2e665afb from 2016-04-30 17:28:24
+0000 was an enhancement to .dir-locals to allow correct fontification
of certain macro constructs.

* .dir-locals.el: Remove the two forms for C Mode dealing with noise macros.
---

diff --git a/.dir-locals.el b/.dir-locals.el
index 1aa71ff6f15..9853d7b5d88 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,10 +1,7 @@
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
          (fill-column . 70)))
- (c-mode . ((c-file-style . "GNU")
-            (c-noise-macro-with-parens-names . ("IF_LINT"))
-            (eval . (c-make-noise-macro-regexps))
-            ))
+ (c-mode . ((c-file-style . "GNU")))
  (objc-mode . ((c-file-style . "GNU")))
  (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
                    (log-edit-setup-add-author . t)))