diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-10 07:44:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-10 07:44:28 -0700 |
| commit | 6d0703a01df1ece3fd9ba2a927913d1bcf10d549 (patch) | |
| tree | e3492449c92c0895ac77853d0a8ea07c0ecfe24f /lisp/progmodes/cc-vars.el | |
| parent | 433d366dc7b053048abf710d790ff62421dd1570 (diff) | |
| parent | d0d9f55b632717fccb605e0a204ebdd5ffe8608f (diff) | |
| download | emacs-6d0703a01df1ece3fd9ba2a927913d1bcf10d549.tar.gz | |
Merge from origin/emacs-25
d0d9f55 Allow newlines inside cl function arglists
963541a Publicize cl--generic-all-functions
3c581d5 ; Fix typo
e58f900 Add some "safe-local-variable" declarations for compatibility...
Diffstat (limited to 'lisp/progmodes/cc-vars.el')
| -rw-r--r-- | lisp/progmodes/cc-vars.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 8cad27fd86d..216f0cc143a 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1679,6 +1679,10 @@ c-noise-macro-with-parens-names is invalid: %s" c-noise-macro-with-parens-names) c-noise-macro-names is invalid: %s" c-noise-macro-names))))) ;; Non-customizable variables, still part of the interface to CC Mode +;; The following two are preparations for Emacs 25.2 (2016-05-09): +(put 'c-noise-macro-names 'safe-local-variable #'c-string-list-p) +(put 'c-noise-macro-with-parens-names 'safe-local-variable #'c-string-list-p) + (defvar c-macro-with-semi-re nil ;; Regular expression which matches a (#define'd) symbol whose expansion ;; ends with a semicolon. |