diff options
| author | Alan Mackenzie <acm@muc.de> | 2016-05-09 17:49:45 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2016-05-09 17:49:45 +0000 |
| commit | a8231e00cbad60652ff7ab6ae51a758f1d939971 (patch) | |
| tree | abbdd240734fb41710e542335fea763e12601596 /.dir-locals.el | |
| parent | 608f2bd0ac9d950a04ad73bf36d96d25b469b9be (diff) | |
| download | emacs-a8231e00cbad60652ff7ab6ae51a758f1d939971.tar.gz | |
CC Mode now uses the new :after-hook feature of define-derived-mode
It now runs internal variable setting functions after the mode hooks, no
longer runs the mode hooks twice, and declares the configuration variables for
noise macros and macros with semicolons as safe variables (when given suitable
arguments).
Fixes bug #16759 and bug #23476.
* .dir-locals: Put the c-noise-macros-with-paren-names setting back into the C
Mode value.
* lisp/progmodes/cc-mode.el: (c-basic-common-init): Remove the call to
c-make-macro-with-semi-re.
(c-mode, c++-mode, objc-mode, java-mode, idl-mode, pike-mode, awk-mode): Move
c-make-noise-macro-regexps and c-make-macro-with-semi-re (where appropriate)
and c-update-modeline into the :after-hook form. Remove the explicit settings
of the syntax table, the abbreviation table and the local key map, since they
duplicate forms generated by define-derived-mode. Remove the explicit
invocation of each mode's mode hook, since they duplicate ones generated by
define-derived-mode.
* lisp/progmodes/cc-vars.el: (c-string-list-p, c-string-or-string-list-p): New
functions.
(c-noise-macro-names, c-noise-macro-with-parens-names): give the
save-local-variable property c-string-list-p.
(c-macro-names-with-semicolon): give the save-local-variable property
c-string-or-string-list-p.
* doc/misc/cc-mode.texi: (Macros with ;, Noise Macros): Note that it's not
necessary to call the regexp generating functions after setting the pertinent
configuration values in a mode hook.
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 9853d7b5d88..7c14802b66e 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,7 +1,8 @@ ((nil . ((tab-width . 8) (sentence-end-double-space . t) (fill-column . 70))) - (c-mode . ((c-file-style . "GNU"))) + (c-mode . ((c-file-style . "GNU") + (c-noise-macro-with-parens-names . ("IF_LINT")))) (objc-mode . ((c-file-style . "GNU"))) (log-edit-mode . ((log-edit-font-lock-gnu-style . t) (log-edit-setup-add-author . t))) |