diff options
| author | Glenn Morris | 2013-05-31 00:05:55 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-31 00:05:55 -0700 |
| commit | 0888c286e53b70c862eedd1871ed4e90b4f66d6e (patch) | |
| tree | 56d156eed7ae05d7fd19411895795a75c1cf9c45 | |
| parent | 19bb8e629352f9438e95e62559bf73940cd3d885 (diff) | |
| download | emacs-0888c286e53b70c862eedd1871ed4e90b4f66d6e.tar.gz emacs-0888c286e53b70c862eedd1871ed4e90b4f66d6e.zip | |
* progmodes/cc-vars.el (c-make-macro-with-semi-re): Silence compiler.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-vars.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c4dc36245f2..41b53a0c375 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-31 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/cc-vars.el (c-make-macro-with-semi-re): Silence compiler. | ||
| 4 | |||
| 1 | 2013-05-31 Dmitry Gutov <dgutov@yandex.ru> | 5 | 2013-05-31 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 6 | ||
| 3 | * progmodes/ruby-mode.el (ruby-syntax-expansion-allowed-p): New | 7 | * progmodes/ruby-mode.el (ruby-syntax-expansion-allowed-p): New |
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index f830cc7edc1..f97e8d1483b 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el | |||
| @@ -1645,6 +1645,7 @@ and is likely to disappear or change its form soon.") | |||
| 1645 | ;; `c-macro-with-semi-re' (or just copy it if it's already a re). | 1645 | ;; `c-macro-with-semi-re' (or just copy it if it's already a re). |
| 1646 | (setq c-macro-with-semi-re | 1646 | (setq c-macro-with-semi-re |
| 1647 | (and | 1647 | (and |
| 1648 | (boundp 'c-opt-cpp-macro-define) | ||
| 1648 | c-opt-cpp-macro-define | 1649 | c-opt-cpp-macro-define |
| 1649 | (cond | 1650 | (cond |
| 1650 | ((stringp c-macro-names-with-semicolon) | 1651 | ((stringp c-macro-names-with-semicolon) |