procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.

Browse source
This commit is contained in:
Stefan Monnier 2010-04-27 13:57:32 -04:00
parent 2a6f654ef1
commit ccaa47655d
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2010-04-27 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
2010-04-27 Sam Steingold <sds@gnu.org>
* progmodes/bug-reference.el (bug-reference-url-format): Mark as

9
lisp/emacs-lisp/lisp.el
View file

@ -624,9 +624,12 @@ considered."
(interactive)
(let* ((data (lisp-completion-at-point predicate))
(plist (nthcdr 3 data)))
(let ((completion-annotate-function (plist-get plist :annotate-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate)))))
(if (null data)
(minibuffer-message "Nothing to complete")
(let ((completion-annotate-function
(plist-get plist :annotate-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate))))))
(defun lisp-completion-at-point (&optional predicate)