emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114053: * lisp/progmodes/cc-mode.el (c-define-abbre


From: Glenn Morris
Subject: [Emacs-diffs] trunk r114053: * lisp/progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
Date: Wed, 28 Aug 2013 23:31:10 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114053
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-28 19:31:06 -0400
message:
  * lisp/progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/cc-mode.el      ccmode.el-20091113204419-o5vbwnq5f7feedwu-1230
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-28 21:19:54 +0000
+++ b/lisp/ChangeLog    2013-08-28 23:31:06 +0000
@@ -1,3 +1,7 @@
+2013-08-28  Glenn Morris  <address@hidden>
+
+       * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
+
 2013-08-28  Stefan Monnier  <address@hidden>
 
        * simple.el (repeat-complex-command--called-interactively-skip):

=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2013-08-28 20:24:18 +0000
+++ b/lisp/progmodes/cc-mode.el 2013-08-28 23:31:06 +0000
@@ -221,7 +221,7 @@
   ;; 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]