* lisp/progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00250a05d5335bc4e472df05d368944b490f91a5..47f6d7a566549fb27a1d28a4321ff7218b0cde0e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-28  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.
+
        * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
 
 2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 337a529241718fa44e45812a8345167f6398d062..c9835bbefe27c5cce247eb2e4b4352d22a13aa0e 100644 (file)
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -244,7 +244,9 @@ Having cyclic cc-require's will result in infinite recursion.  That's
 somewhat intentional."
   `(progn
      (eval-when-compile
-       (setq cc-bytecomp-noruntime-functions byte-compile-noruntime-functions)
+       (if (boundp 'byte-compile-noruntime-functions) ; in case load uncompiled
+          (setq cc-bytecomp-noruntime-functions
+                byte-compile-noruntime-functions))
        (cc-bytecomp-load (symbol-name ,cc-part)))
      ;; Hack to suppress spurious "might not be defined at runtime" warnings.
      ;; The basic issue is that