# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1272391052 14400
# Node ID 624169215019502e34ca6acf8783d7fcce3cb570
# Parent  087c3dc49930493de8f4d48e494843b1c176dad2
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.

diff -r 087c3dc49930 -r 624169215019 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 27 11:13:42 2010 -0400
+++ b/lisp/ChangeLog	Tue Apr 27 13:57:32 2010 -0400
@@ -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
diff -r 087c3dc49930 -r 624169215019 lisp/emacs-lisp/lisp.el
--- a/lisp/emacs-lisp/lisp.el	Tue Apr 27 11:13:42 2010 -0400
+++ b/lisp/emacs-lisp/lisp.el	Tue Apr 27 13:57:32 2010 -0400
@@ -624,9 +624,12 @@
   (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)