From 2bb762d48a2c1a993b3711440c06fb3420fb0318 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 28 Aug 2013 19:31:52 -0400 Subject: [PATCH] * lisp/progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case. --- lisp/ChangeLog | 2 ++ lisp/progmodes/cc-bytecomp.el | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 00250a05d53..47f6d7a5665 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-08-28 Glenn Morris + * 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 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 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 -- 2.39.2