summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-11-07 13:32:33 +0200
committerEli Zaretskii <eliz@gnu.org>2015-11-07 13:32:33 +0200
commitbede518c38db805ab9ac4b86f570ca9bff79a783 (patch)
treed48bc534118e9ac156ee728d02681bb0c66f687d /lisp
parentb29be628889c4bdec24f14a3352848d559446a70 (diff)
downloademacs-bede518c38db805ab9ac4b86f570ca9bff79a783.tar.gz
Fix error in copy-abbrev-table
* lisp/abbrev.el (define-abbrev): Don't erase the :abbrev-table-modiff property of the abbrev-table. (Bug#21828) * test/automated/abbrev-tests.el: New file.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/abbrev.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index f372a280ffe..bd1650b5694 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -87,6 +87,7 @@ be replaced by its expansion."
"Make a new abbrev-table with the same abbrevs as TABLE.
Does not copy property lists."
(let ((new-table (make-abbrev-table)))
+ (message "modif: %s" (abbrev-table-get new-table :abbrev-table-modiff))
(mapatoms
(lambda (symbol)
(define-abbrev new-table
@@ -580,6 +581,8 @@ An obsolete but still supported calling form is:
,@(if (cadr props) (list :system (cadr props))))))
(unless (plist-get props :count)
(setq props (plist-put props :count 0)))
+ (setq props (plist-put props :abbrev-table-modiff
+ (abbrev-table-get table :abbrev-table-modiff)))
(let ((system-flag (plist-get props :system))
(sym (intern name table)))
;; Don't override a prior user-defined abbrev with a system abbrev,