diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-10-29 22:15:28 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-10-29 22:15:28 -0700 |
| commit | 52b410c60aebeb769ec9580af25ca50df2a44751 (patch) | |
| tree | ba5de0b896c5ea410ceb2f2f1866c0fac73ea236 /lisp/progmodes/cc-langs.el | |
| parent | cc99f920f507d28bb1422f8a3d52723ddc734c8a (diff) | |
| parent | 237bf45a48999d5a8a3617822dddf3ea305bc269 (diff) | |
| download | emacs-52b410c60aebeb769ec9580af25ca50df2a44751.tar.gz | |
Merge from emacs-24; up to 117634
Diffstat (limited to 'lisp/progmodes/cc-langs.el')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index bab928ac5dd..a8dc3b8968c 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -3238,7 +3238,7 @@ accomplish that conveniently." `(lambda () ;; This let sets up the context for `c-mode-var' and similar - ;; that could be in the result from `macroexpand-all'. + ;; that could be in the result from `c--macroexpand-all'. (let ((c-buffer-is-cc-mode ',mode) current-var source-eval) (c-make-emacs-variables-local) @@ -3248,12 +3248,12 @@ accomplish that conveniently." (setq ,@(let ((c-buffer-is-cc-mode mode) (c-lang-const-expansion 'immediate)) ;; `c-lang-const' will expand to the evaluated - ;; constant immediately in `macroexpand-all' + ;; constant immediately in `c--macroexpand-all' ;; below. (mapcan (lambda (init) `(current-var ',(car init) - ,(car init) ,(macroexpand-all + ,(car init) ,(c--macroexpand-all (elt init 1)))) ;; Note: The following `append' copies the ;; first argument. That list is small, so |