* lisp/progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 690aca9540f4962939bf13a7ff0d655a0456c436..00250a05d5335bc4e472df05d368944b490f91a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-28  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
+
 2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (repeat-complex-command--called-interactively-skip):

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index c3884309d486ef7b2184928efc9a24350e774776..1e8d6cba8c4cb78c3f70521cfe36d3109c7882b2 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -221,7 +221,7 @@ control).  See \"cc-mode.el\" for more info."
   ;; Compatibility wrapper for `define-abbrev' which passes a non-nil
   ;; sixth argument for SYSTEM-FLAG in emacsen that support it
   ;; (currently only Emacs >= 21.2).
-  (let ((table (or (symbol-value name)
+  (let ((table (or (and (boundp name) (symbol-value name))
                   (progn (condition-case nil
                               (define-abbrev-table name nil doc)
                             (wrong-number-of-arguments ;E.g. Emacs<23.