[Emacs-diffs] /srv/bzr/emacs/trunk r100060: * emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.

[Stefan Monnier]

------------------------------------------------------------
revno: 100060
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-27 13:57:32 -0400
message:
  * emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-27 15:13:42 +0000
+++ b/lisp/ChangeLog    2010-04-27 17:57:32 +0000
@@ -1,3 +1,7 @@
+2010-04-27  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
+
 2010-04-27  Sam Steingold  <address@hidden>
 
        * progmodes/bug-reference.el (bug-reference-url-format): Mark as

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2010-04-21 17:53:03 +0000
+++ b/lisp/emacs-lisp/lisp.el   2010-04-27 17:57:32 +0000
@@ -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)