procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/abbrev.el (define-abbrev-table): Treat a non-string "docstring" as

Browse source 
part of the "props" arguments rather than silently ignoring it.
This commit is contained in:
Stefan Monnier 2015-04-02 10:00:48 -04:00
parent 5e41a51e5c
commit 0c2ea36d20
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2015-04-02 Stefan Monnier <monnier@iro.umontreal.ca>
* abbrev.el (define-abbrev-table): Treat a non-string "docstring" as
part of the "props" arguments rather than silently ignoring it.
* emacs-lisp/lisp-mnt.el (lm-version): Don't burp in a non-file buffer.
2015-04-01 Alan Mackenzie <acm@muc.de>

4
lisp/abbrev.el
View file

@ -976,7 +976,8 @@ Properties with special meaning:
;; We used to manually add the docstring, but we also want to record this
;; location as the definition of the variable (in load-history), so we may
;; as well just use `defvar'.
(eval `(defvar ,tablename nil ,@(if (stringp docstring) (list docstring))))
(eval `(defvar ,tablename nil ,@(if (stringp docstring) (list docstring)
(when props (push docstring props) nil))))
(let ((table (if (boundp tablename) (symbol-value tablename))))
(unless table
(setq table (make-abbrev-table))
@ -987,6 +988,7 @@ Properties with special meaning:
;; if the table was pre-existing as is the case if it was created by
;; loading the user's abbrev file.
(while (consp props)
(unless (cdr props) (error "Missing value for property %S" (car props)))
(abbrev-table-put table (pop props) (pop props)))
(dolist (elt definitions)
(apply 'define-abbrev table elt))))