# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1209175144 0
# Node ID f7eb2887e5b51dc2c5b0cd10e46f32240e4d034f
# Parent  add0e6cf43368a61cfb57dc0b6bf8bb8b062c767
(define-abbrev-table): Apply props even if the table exists already.

diff -r add0e6cf4336 -r f7eb2887e5b5 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 26 01:47:11 2008 +0000
+++ b/lisp/ChangeLog	Sat Apr 26 01:59:04 2008 +0000
@@ -1,5 +1,8 @@
 2008-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* abbrev.el (define-abbrev-table): Apply props even if the table
+	exists already.
+
 	* minibuffer.el (completion-table-with-context): Fix `pred' for the
 	various kinds of completion tables.
 	(completion-emacs22-try-completion): Place cursor after the /, as was
diff -r add0e6cf4336 -r f7eb2887e5b5 lisp/abbrev.el
--- a/lisp/abbrev.el	Sat Apr 26 01:47:11 2008 +0000
+++ b/lisp/abbrev.el	Sat Apr 26 01:59:04 2008 +0000
@@ -914,9 +914,14 @@
   (eval `(defvar ,tablename nil ,@(if (stringp docstring) (list docstring))))
   (let ((table (if (boundp tablename) (symbol-value tablename))))
     (unless table
-      (setq table (make-abbrev-table props))
+      (setq table (make-abbrev-table))
       (set tablename table)
       (push tablename abbrev-table-name-list))
+    ;; We used to just pass them to `make-abbrev-table', but that fails
+    ;; if the table was pre-existing as is the case if it was created by
+    ;; loading the user's abbrev file.
+    (while (consp props)
+      (abbrev-table-put table (pop props) (pop props)))
     (dolist (elt definitions)
       (apply 'define-abbrev table elt))))