From: Glenn Morris <rgm@gnu.org>
Date: Wed, 28 Aug 2013 23:31:06 +0000 (-0400)
Subject: * lisp/progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=27be8d399630289bd0cb1d183e4cc816c3ba7392;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 690aca9540f..00250a05d53 100644
--- 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 c3884309d48..1e8d6cba8c4 100644
--- 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.