From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 14 Jan 2008 20:17:52 +0000 (+0000)
Subject: (clear-abbrev-table): Can't pass a symbol to intern.
X-Git-Tag: emacs-pretest-23.0.90~8568
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=938a9a9e11e6a2f9c7a23d65783d59ba73ec4f0a;p=emacs.git

(clear-abbrev-table): Can't pass a symbol to intern.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc0b5e4d634..203de0951e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* abbrev.el (clear-abbrev-table): Can't pass a symbol to intern.
+
 2008-01-14  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-local-host-p): Use `tramp-file-name-host'
@@ -7,7 +11,7 @@
 
 2008-01-14  Alan Mackenzie  <acm@muc.de>
 
-	* progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro
+	* progmodes/cc-engine.el (c-guess-basic-syntax): Prevent a macro
 	call inside a struct being recognised as a K&R argument.
 
 2008-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index ff99430e027..5cdd2d0aa8f 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -524,7 +524,9 @@ the current abbrev table before abbrev lookup happens."
       (aset table i 0))
     ;; Preserve the table's properties.
     (assert sym)
-    (intern sym table)
+    (let ((newsym (intern "" table)))
+      (set newsym nil)	     ; Make sure it won't be confused for an abbrev.
+      (setplist newsym (symbol-plist sym)))
     (abbrev-table-put table :abbrev-table-modiff
                       (1+ (abbrev-table-get table :abbrev-table-modiff)))))