procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dired.c (file_name_completion): Don't return t if the match is exact

Browse source 
but with different capitalization.
* minibuf.c (Ftry_completion): Simplify.
This commit is contained in:
Stefan Monnier 2008-06-10 18:41:01 +00:00
parent ce0584934b
commit 928b5acc5e
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

4
src/dired.c
View file

@ -768,7 +768,9 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate)
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));

8
src/minibuf.c
View file

@ -1508,13 +1508,7 @@ is used to further constrain the set of candidates. */)
/* 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 */