diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
| commit | 4f7a90bf6ce831063d721324e712f8c38e85c678 (patch) | |
| tree | 73e980746ddc55c4285d145769a94b2845cbfcdf /lisp/abbrev.el | |
| parent | 620e5a3cd4464aaffaa3568d6f6b89764de5cfbd (diff) | |
| parent | 9adb101353e1f3d41a8f822fa4164e9b41e82ce5 (diff) | |
| download | emacs-4f7a90bf6ce831063d721324e712f8c38e85c678.tar.gz emacs-4f7a90bf6ce831063d721324e712f8c38e85c678.tar.bz2 emacs-4f7a90bf6ce831063d721324e712f8c38e85c678.zip | |
Merge from origin/emacs-25
9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks
# Conflicts:
# lisp/menu-bar.el
Diffstat (limited to 'lisp/abbrev.el')
| -rw-r--r-- | lisp/abbrev.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el index b6d202c1807..df817aeae22 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -979,10 +979,10 @@ 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'. - (if (and docstring props (symbolp docstring)) - ;; There is really no docstring, instead the docstring arg - ;; is a property name. - (push docstring props) (setq docstring nil)) + (when (and docstring props (symbolp docstring)) + ;; There is really no docstring, instead the docstring arg + ;; is a property name. + (push docstring props) (setq docstring nil)) (eval `(defvar ,tablename nil ,@(if docstring (list docstring)))) (let ((table (if (boundp tablename) (symbol-value tablename)))) (unless table |