diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-12-26 11:04:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-26 11:04:41 -0800 |
| commit | 13a9e339f24b07a1ddde7cc0500a1e7a1787d4ab (patch) | |
| tree | 4baa4a9c22214c98a7e94972be14dbc018ffe72f /lisp/use-package | |
| parent | 44cb99fcc75bc6d228113862716650c7fa2de68e (diff) | |
| parent | 9638870f53a895264cef748e7c2afb24f28b0cf1 (diff) | |
| download | emacs-13a9e339f24b07a1ddde7cc0500a1e7a1787d4ab.tar.gz emacs-13a9e339f24b07a1ddde7cc0500a1e7a1787d4ab.tar.bz2 emacs-13a9e339f24b07a1ddde7cc0500a1e7a1787d4ab.zip | |
Merge pull request from justbur/elisp-cap
Handle automatic macro expansion by elisp-completion-at-point
GitHub-reference: https://github.com/jwiegley/use-package/issues/599
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package-core.el | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index c7e367be188..c4c251e9a00 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -559,6 +559,15 @@ extending any keys already present." (let* ((name-symbol (if (stringp name) (intern name) name)) (name-string (symbol-name name-symbol))) + ;; The function `elisp--local-variables' inserts this unbound variable into + ;; macro forms to determine the locally bound variables for + ;; `elisp-completion-at-point'. It ends up throwing a lot of errors since it + ;; can occupy the position of a keyword (or look like a second argument to a + ;; keyword that takes one). Deleting it when it's at the top level should be + ;; harmless since there should be no locally bound variables to discover + ;; here anyway. + (setq args (delq 'elisp--witness--lisp args)) + ;; Reduce the set of keywords down to its most fundamental expression. (setq args (use-package-unalias-keywords name-symbol args)) |