2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 187f9183a5d..0982a0b026f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-06  Sean O'Rourke  <sorourke@cs.ucsd.edu>
+
+        * complete.el (PC-do-completion): Don't try to treat
+          empty string as an abbreviation.
+
 2007-09-06  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
         * help-fns.el (describe-variable): Keep doc's text properties.
diff --git a/lisp/complete.el b/lisp/complete.el
index 01db126c5f8..bc581052508 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -596,9 +596,10 @@ GOTO-END is non-nil, however, it instead replaces up to END."
           (setq poss (all-completions (if env-on basestr str)
                                       table
                                       pred))
-          (unless poss
+          (unless (or poss (string-equal str ""))
             ;; Try completion as an abbreviation, e.g. "mvb" ->
-            ;; "m-v-b" -> "multiple-value-bind"
+            ;; "m-v-b" -> "multiple-value-bind", but only for
+            ;; non-empty strings.
             (setq origstr str
                   abbreviated t)
             (if filename