summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-04-27 13:57:32 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2010-04-27 13:57:32 -0400
commitccaa47655d21a7c5b37d4e3607deb9c729b34d70 (patch)
tree25f6d5aa276be40e2f1620186016980c4070bda9 /lisp/emacs-lisp
parent2a6f654ef1656603fa9f3d925efe3e1a5cbe0ecc (diff)
downloademacs-ccaa47655d21a7c5b37d4e3607deb9c729b34d70.tar.gz
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/lisp.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 58289660a3c..6e209156b92 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -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)