diff options
| author | Stefan Monnier | 2013-10-17 00:49:42 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-10-17 00:49:42 -0400 |
| commit | e333fb100ba1eac0533a58be233695317d68b5a3 (patch) | |
| tree | 2c315f2e9c08f1cb4e4a218395c9a16ed7767b46 | |
| parent | 85527ff309fc9ac5fbda80b119f021719902cc7c (diff) | |
| download | emacs-e333fb100ba1eac0533a58be233695317d68b5a3.tar.gz emacs-e333fb100ba1eac0533a58be233695317d68b5a3.zip | |
* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Complete var names for
let-bindings.
| -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 @@ | |||
| 1 | 2013-10-17 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2013-10-17 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * emacs-lisp/lisp.el (lisp-completion-at-point): Complete var names for | ||
| 4 | let-bindings. | ||
| 5 | |||
| 3 | * progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's | 6 | * progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's |
| 4 | forward-sexp-function while we redo its job (bug#15613). | 7 | forward-sexp-function while we redo its job (bug#15613). |
| 5 | 8 | ||
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." | |||
| 867 | (< (point) beg))))) | 867 | (< (point) beg))))) |
| 868 | (list t obarray | 868 | (list t obarray |
| 869 | :predicate (lambda (sym) (get sym 'error-conditions)))) | 869 | :predicate (lambda (sym) (get sym 'error-conditions)))) |
| 870 | ((and ?\( | ||
| 871 | (guard (save-excursion | ||
| 872 | (goto-char (1- beg)) | ||
| 873 | (up-list -1) | ||
| 874 | (forward-symbol -1) | ||
| 875 | (looking-at "\\_<let\\*?\\_>")))) | ||
| 876 | (list t obarray | ||
| 877 | :predicate #'boundp | ||
| 878 | :company-doc-buffer #'lisp--company-doc-buffer | ||
| 879 | :company-docsig #'lisp--company-doc-string | ||
| 880 | :company-location #'lisp--company-location)) | ||
| 870 | (_ (list nil obarray | 881 | (_ (list nil obarray |
| 871 | :predicate #'fboundp | 882 | :predicate #'fboundp |
| 872 | :company-doc-buffer #'lisp--company-doc-buffer | 883 | :company-doc-buffer #'lisp--company-doc-buffer |