diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
| commit | 0274862f395807d05585eb6325c5285f1bf775d8 (patch) | |
| tree | da85c643cf8040db118538bf7705d2a461ec055a /lisp/progmodes/elisp-mode.el | |
| parent | f902a6b89e6970eabaaf3c2c1452bf2104e2004b (diff) | |
| parent | d08afa1d0339425f03a48e533166a7cadfa66139 (diff) | |
| download | emacs-0274862f395807d05585eb6325c5285f1bf775d8.tar.gz emacs-0274862f395807d05585eb6325c5285f1bf775d8.tar.bz2 emacs-0274862f395807d05585eb6325c5285f1bf775d8.zip | |
Merge from origin/emacs-25
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...
# Conflicts:
# ChangeLog.2
# src/lisp.h
Diffstat (limited to 'lisp/progmodes/elisp-mode.el')
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 49d39126c05..d6f26795132 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -539,9 +539,9 @@ functions are annotated with \"<f>\" via the (delete-dups ;; FIXME: We should include some ;; docstring with each entry. - (append - macro-declarations-alist - defun-declarations-alist))))) + (append macro-declarations-alist + defun-declarations-alist + nil))))) ; Copy both alists. ((and (or `condition-case `condition-case-unless-debug) (guard (save-excursion (ignore-errors |