diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-08-28 19:31:52 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-08-28 19:31:52 -0400 |
| commit | 2bb762d48a2c1a993b3711440c06fb3420fb0318 (patch) | |
| tree | 3b84b186de7d7cd64ab5fd4328bf8fa095fda79e /lisp | |
| parent | 27be8d399630289bd0cb1d183e4cc816c3ba7392 (diff) | |
| download | emacs-2bb762d48a2c1a993b3711440c06fb3420fb0318.tar.gz | |
* lisp/progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-bytecomp.el | 4 |
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 @@ 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 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 |