[Emacs-diffs] trunk r117534: Unbreak compilation of derived cc-mode modes

[Daniel Colascione]

------------------------------------------------------------
revno: 117534
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Mon 2014-07-14 16:58:52 -0700
message:
  Unbreak compilation of derived cc-mode modes
  
  * lisp/progmodes/cc-defs.el (c-lang-defconst-eval-immediately):
  Use `macroexpand-all' instead of `cl-macroexpand-all'.
  
  * lisp/progmodes/cc-langs.el: Change comments from `cl-macroexpand-all'
  to `macroexpand-all'
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/cc-defs.el      ccdefs.el-20091113204419-o5vbwnq5f7feedwu-1226
  lisp/progmodes/cc-langs.el     cclangs.el-20091113204419-o5vbwnq5f7feedwu-1228

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-12 17:53:29 +0000
+++ b/lisp/ChangeLog    2014-07-14 23:58:52 +0000
@@ -1,3 +1,11 @@
+2014-07-14  Daniel Colascione  <address@hidden>
+
+       * progmodes/cc-langs.el: Change comments from `cl-macroexpand-all'
+       to `macroexpand-all'
+
+       * progmodes/cc-defs.el (c-lang-defconst-eval-immediately):
+       Use `macroexpand-all' instead of `cl-macroexpand-all'.
+
 2014-07-12  Paul Eggert  <address@hidden>
 
        Fix bug: C-x v v discarded existing log message (Bug#17884).

=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2014-06-29 11:26:47 +0000
+++ b/lisp/progmodes/cc-defs.el 2014-07-14 23:58:52 +0000
@@ -1836,12 +1836,9 @@
 immediately, i.e. at the same time as the `c-lang-defconst' form
 itself is evaluated."
   ;; Evaluate at macro expansion time, i.e. in the
-  ;; `cl-macroexpand-all' inside `c-lang-defconst'.
+  ;; `macroexpand-all' inside `c-lang-defconst'.
   (eval form))
 
-;; Only used at compile time - suppress "might not be defined at runtime".
-(declare-function cl-macroexpand-all "cl" (form &optional env))
-
 (defmacro c-lang-defconst (name &rest args)
   "Set the language specific values of the language constant NAME.
 The second argument can optionally be a docstring.  The rest of the
@@ -1883,7 +1880,7 @@
 
   (let* ((sym (intern (symbol-name name) c-lang-constants))
         ;; Make `c-lang-const' expand to a straightforward call to
-        ;; `c-get-lang-constant' in `cl-macroexpand-all' below.
+        ;; `c-get-lang-constant' in `macroexpand-all' below.
         ;;
         ;; (The default behavior, i.e. to expand to a call inside
         ;; `eval-when-compile' should be equivalent, since that macro
@@ -1946,7 +1943,7 @@
        ;; reason, but we also use this expansion handle
        ;; `c-lang-defconst-eval-immediately' and to register
        ;; dependencies on the `c-lang-const's in VAL.)
-       (setq val (cl-macroexpand-all val))
+       (setq val (macroexpand-all val))
 
        (setq bindings (cons (cons assigned-mode val) bindings)
              args (cdr args))))

=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el        2014-06-29 11:26:47 +0000
+++ b/lisp/progmodes/cc-langs.el        2014-07-14 23:58:52 +0000
@@ -213,7 +213,6 @@
 ;; These are defined in cl as aliases to the cl- versions.
 ;(declare-function delete-duplicates "cl-seq" (cl-seq &rest cl-keys) t)
 ;(declare-function mapcan "cl-extra" (cl-func cl-seq &rest cl-rest) t)
-;(declare-function cl-macroexpand-all "cl" (form &optional env))
 
 (eval-and-compile
   ;; Some helper functions used when building the language constants.
@@ -3185,7 +3184,7 @@
       `(lambda ()
 
         ;; This let sets up the context for `c-mode-var' and similar
-        ;; that could be in the result from `cl-macroexpand-all'.
+        ;; that could be in the result from `macroexpand-all'.
         (let ((c-buffer-is-cc-mode ',mode)
               current-var source-eval)
           (c-make-emacs-variables-local)
@@ -3195,7 +3194,7 @@
                   (setq ,@(let ((c-buffer-is-cc-mode mode)
                                 (c-lang-const-expansion 'immediate))
                             ;; `c-lang-const' will expand to the evaluated
-                            ;; constant immediately in `cl-macroexpand-all'
+                            ;; constant immediately in `macroexpand-all'
                             ;; below.
                              (cl-mapcan
                               (lambda (init)