diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bbff921661d..6f8636c8bd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-10-17 Stefan Monnier <monnier@iro.umontreal.ca> + * emacs-lisp/lisp.el (lisp-completion-at-point): Complete var names for + let-bindings. + * progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's forward-sexp-function while we redo its job (bug#15613). diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 11891679202..1350af1a563 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -867,6 +867,17 @@ considered." (< (point) beg))))) (list t obarray :predicate (lambda (sym) (get sym 'error-conditions)))) + ((and ?\( + (guard (save-excursion + (goto-char (1- beg)) + (up-list -1) + (forward-symbol -1) + (looking-at "\\_<let\\*?\\_>")))) + (list t obarray + :predicate #'boundp + :company-doc-buffer #'lisp--company-doc-buffer + :company-docsig #'lisp--company-doc-string + :company-location #'lisp--company-location)) (_ (list nil obarray :predicate #'fboundp :company-doc-buffer #'lisp--company-doc-buffer |