diff options
author | Alan Mackenzie <acm@muc.de> | 2016-03-25 18:25:08 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2016-03-25 18:25:08 +0000 |
commit | 368b9bb45f125061506d43af4bd4791ab2cfd7b9 (patch) | |
tree | 1c1d8b1e6368aaea6509fd274d0c8f2929743cd1 /lisp/progmodes/cc-vars.el | |
parent | 7570b35740915626e94c6038e3203374ce4267b1 (diff) | |
download | emacs-368b9bb45f125061506d43af4bd4791ab2cfd7b9.tar.gz emacs-368b9bb45f125061506d43af4bd4791ab2cfd7b9.tar.bz2 emacs-368b9bb45f125061506d43af4bd4791ab2cfd7b9.zip |
Fix absence of c-noise-macro-name-re, etc., in languages which don't use it
* lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id, c-forward-type)
(c-forward-declarator, c-forward-decl-or-cast-1, c-backward-over-enum-header)
(c-guess-basic-syntax): Check c-opt-cpp-prefix before `looking-at'
c-noise-macro-with-parens-name-re.
* lisp/progmodes/cc-fonts.el (c-complex-decl-matchers): The same as for
cc-engine.el.
* lisp/progmodes/cc-mode.el (c-basic-common-init): Add call to
`c-make-noise-macro-regexps'.
(c-mode, c++-mode, objc-mode): Remove calls to `c-make-noise-macro-regexps'.
* lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-name-re)
(c-noise-macro-with-re): Initialize to "\\<\\>" rather than nil.
Diffstat (limited to 'lisp/progmodes/cc-vars.el')
-rw-r--r-- | lisp/progmodes/cc-vars.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index a6957185a2b..33ea152c89a 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1619,8 +1619,8 @@ names).")) :type 'c-extra-types-widget :group 'c) -(defvar c-noise-macro-with-parens-name-re nil) -(defvar c-noise-macro-name-re nil) +(defvar c-noise-macro-with-parens-name-re "\\<\\>") +(defvar c-noise-macro-name-re "\\<\\>") (defcustom c-noise-macro-names nil "A list of names of macros which expand to nothing, or compiler extensions |