diff options
| author | Paul Pogonyshev | 2016-07-23 10:12:56 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2016-07-23 10:16:38 -0400 |
| commit | bc4c07fca58a140c197c0e4010550d42c808b416 (patch) | |
| tree | ed9197921dd3a4866b289d3d73fc2def83d546f9 | |
| parent | 66f95e0dabf750e9d2eff59b2bb6e593618cd48a (diff) | |
| download | emacs-bc4c07fca58a140c197c0e4010550d42c808b416.tar.gz emacs-bc4c07fca58a140c197c0e4010550d42c808b416.zip | |
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).
| -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 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 | |||
| 542 | (delete-dups | 542 | (delete-dups |
| 543 | ;; FIXME: We should include some | 543 | ;; FIXME: We should include some |
| 544 | ;; docstring with each entry. | 544 | ;; docstring with each entry. |
| 545 | (append | 545 | (append macro-declarations-alist |
| 546 | macro-declarations-alist | 546 | defun-declarations-alist |
| 547 | defun-declarations-alist))))) | 547 | nil))))) ; Copy both alists. |
| 548 | ((and (or `condition-case `condition-case-unless-debug) | 548 | ((and (or `condition-case `condition-case-unless-debug) |
| 549 | (guard (save-excursion | 549 | (guard (save-excursion |
| 550 | (ignore-errors | 550 | (ignore-errors |