(do_completion): Try again if we rewrite the input string, but no

  completion was done, so that any completion message will be correct.

diff --git a/src/ChangeLog b/src/ChangeLog
index 984cb3e81dbbd3b28f22fedcf45259b82dfe20b6..db632de81b4d5b5d628a22468e142412dddcbf8a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-21  Miles Bader  <miles@gnu.org>
+
+       * minibuf.c (do_completion): Try again if we rewrite the input
+       string, but no completion was done, so that any completion message
+       will be correct.
+
 2000-08-20  Gerd Moellmann  <gerd@gnu.org>
 
        * xfaces.c (lface_equal_p): Compare strings differently.

diff --git a/src/minibuf.c b/src/minibuf.c
index e730f8a91ca8c9ff06afc96cafc655602ca0be56..50cd82ae1afbe18b57a5b309f74ca8a9b9a7fee9 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1616,6 +1616,17 @@ do_completion ()
     {
       Fdelete_field (make_number (ZV)); /* Some completion happened */
       Finsert (1, &completion);
+
+      if (! completedp)
+       /* The case of the string changed, but that's all.  We're not
+          sure whether this is a unique completion or not, so try again
+          using the real case (this shouldn't recurse again, because
+          the next time try-completion will return either `t' or the
+          exact string).  */
+       {
+         UNGCPRO;
+         return do_completion ();
+       }
     }
 
   /* It did find a match.  Do we match some possibility exactly now? */