# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1213123261 0
# Node ID a17231a1f8f8b1bdf60284ee6a0ed945b2ae8007
# Parent  4538778f611d22550b93eee19475b5d84be4a39d
* dired.c (file_name_completion): Don't return t if the match is exact
but with different capitalization.
* minibuf.c (Ftry_completion): Simplify.

diff -r 4538778f611d -r a17231a1f8f8 src/ChangeLog
--- a/src/ChangeLog	Tue Jun 10 16:50:18 2008 +0000
+++ b/src/ChangeLog	Tue Jun 10 18:41:01 2008 +0000
@@ -1,5 +1,9 @@
 2008-06-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* dired.c (file_name_completion): Don't return t if the match is exact
+	but with different capitalization.
+	* minibuf.c (Ftry_completion): Simplify.
+
 	* window.c (Vwindow_point_insertion_type): New var.
 	(set_window_buffer): Use it.
 	(syms_of_window): Init and export it to Lisp.
diff -r 4538778f611d -r a17231a1f8f8 src/dired.c
--- a/src/dired.c	Tue Jun 10 16:50:18 2008 +0000
+++ b/src/dired.c	Tue Jun 10 18:41:01 2008 +0000
@@ -768,7 +768,9 @@
 
   if (all_flag || NILP (bestmatch))
     return bestmatch;
-  if (matchcount == 1 && bestmatchsize == SCHARS (file))
+  /* Return t if the supplied string is an exact match (counting case);
+     it does not require any change to be made.  */
+  if (matchcount == 1 && !NILP (Fequal (bestmatch, file)))
     return Qt;
   bestmatch = Fsubstring (bestmatch, make_number (0),
 			  make_number (bestmatchsize));
diff -r 4538778f611d -r a17231a1f8f8 src/minibuf.c
--- a/src/minibuf.c	Tue Jun 10 16:50:18 2008 +0000
+++ b/src/minibuf.c	Tue Jun 10 18:41:01 2008 +0000
@@ -1508,13 +1508,7 @@
 
   /* Return t if the supplied string is an exact match (counting case);
      it does not require any change to be made.  */
-  if (matchcount == 1 && bestmatchsize == SCHARS (string)
-      && (tem = Fcompare_strings (bestmatch, make_number (0),
-				  make_number (bestmatchsize),
-				  string, make_number (0),
-				  make_number (bestmatchsize),
-				  Qnil),
-	  EQ (Qt, tem)))
+  if (matchcount == 1 && !NILP (Fequal (bestmatch, string)))
     return Qt;
 
   XSETFASTINT (zero, 0);		/* Else extract the part in which */