aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-08-28 19:31:52 -0400
committerGlenn Morris2013-08-28 19:31:52 -0400
commit2bb762d48a2c1a993b3711440c06fb3420fb0318 (patch)
tree3b84b186de7d7cd64ab5fd4328bf8fa095fda79e
parent27be8d399630289bd0cb1d183e4cc816c3ba7392 (diff)
downloademacs-2bb762d48a2c1a993b3711440c06fb3420fb0318.tar.gz
emacs-2bb762d48a2c1a993b3711440c06fb3420fb0318.zip
* lisp/progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/cc-bytecomp.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00250a05d53..47f6d7a5665 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-08-28 Glenn Morris <rgm@gnu.org> 12013-08-28 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.
4
3 * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound. 5 * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
4 6
52013-08-28 Stefan Monnier <monnier@iro.umontreal.ca> 72013-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 337a5292417..c9835bbefe2 100644
--- 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
244somewhat intentional." 244somewhat intentional."
245 `(progn 245 `(progn
246 (eval-when-compile 246 (eval-when-compile
247 (setq cc-bytecomp-noruntime-functions byte-compile-noruntime-functions) 247 (if (boundp 'byte-compile-noruntime-functions) ; in case load uncompiled
248 (setq cc-bytecomp-noruntime-functions
249 byte-compile-noruntime-functions))
248 (cc-bytecomp-load (symbol-name ,cc-part))) 250 (cc-bytecomp-load (symbol-name ,cc-part)))
249 ;; Hack to suppress spurious "might not be defined at runtime" warnings. 251 ;; Hack to suppress spurious "might not be defined at runtime" warnings.
250 ;; The basic issue is that 252 ;; The basic issue is that