From: Paul Pogonyshev <pogonyshev@gmail.com>
Date: Sat, 23 Jul 2016 14:12:56 +0000 (-0400)
Subject: Don't let completion break `declare' handling
X-Git-Tag: emacs-25.1-rc1~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc4c07f;p=emacs.git

Don't let completion break `declare' handling

* elisp-mode.el (elisp-completion-at-point): Fix to not alter
`defun-declarations-alist' by side effect (Bug #23648).
---

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 5111f887091..d02951dcf62 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -542,9 +542,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