diff options
| author | Alan Mackenzie | 2016-05-16 13:56:24 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2016-05-16 13:56:24 +0000 |
| commit | 2d57359d2d3fd1674ee3fe7fec24c404e3e01d41 (patch) | |
| tree | 28cf8ec428a39f9444f1821ee0261dded840d07d | |
| parent | 116acebfbd28649b6ccf34e5c9046738d57aa28e (diff) | |
| download | emacs-2d57359d2d3fd1674ee3fe7fec24c404e3e01d41.tar.gz emacs-2d57359d2d3fd1674ee3fe7fec24c404e3e01d41.zip | |
Tidy up redundant code in cc-vars.el caused by mistake in emacs-25 -> master
| -rw-r--r-- | lisp/progmodes/cc-vars.el | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 216f0cc143a..8cad27fd86d 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el | |||
| @@ -1679,10 +1679,6 @@ c-noise-macro-with-parens-names is invalid: %s" c-noise-macro-with-parens-names) | |||
| 1679 | c-noise-macro-names is invalid: %s" c-noise-macro-names))))) | 1679 | c-noise-macro-names is invalid: %s" c-noise-macro-names))))) |
| 1680 | 1680 | ||
| 1681 | ;; Non-customizable variables, still part of the interface to CC Mode | 1681 | ;; Non-customizable variables, still part of the interface to CC Mode |
| 1682 | ;; The following two are preparations for Emacs 25.2 (2016-05-09): | ||
| 1683 | (put 'c-noise-macro-names 'safe-local-variable #'c-string-list-p) | ||
| 1684 | (put 'c-noise-macro-with-parens-names 'safe-local-variable #'c-string-list-p) | ||
| 1685 | |||
| 1686 | (defvar c-macro-with-semi-re nil | 1682 | (defvar c-macro-with-semi-re nil |
| 1687 | ;; Regular expression which matches a (#define'd) symbol whose expansion | 1683 | ;; Regular expression which matches a (#define'd) symbol whose expansion |
| 1688 | ;; ends with a semicolon. | 1684 | ;; ends with a semicolon. |