diff options
| author | Stefan Monnier | 2008-06-10 18:41:01 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-06-10 18:41:01 +0000 |
| commit | 928b5acc5e1e370d98a73d65ea13df4a67a82c4b (patch) | |
| tree | 8899731a48c162674b64d9fc9ba477cba70f574b /src/dired.c | |
| parent | ce0584934b03b76077f7a59cb2f1fa9550ab9649 (diff) | |
| download | emacs-928b5acc5e1e370d98a73d65ea13df4a67a82c4b.tar.gz emacs-928b5acc5e1e370d98a73d65ea13df4a67a82c4b.zip | |
* dired.c (file_name_completion): Don't return t if the match is exact
but with different capitalization.
* minibuf.c (Ftry_completion): Simplify.
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dired.c b/src/dired.c index 7de334bb876..2d82c4bfdc3 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -768,7 +768,9 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate) | |||
| 768 | 768 | ||
| 769 | if (all_flag || NILP (bestmatch)) | 769 | if (all_flag || NILP (bestmatch)) |
| 770 | return bestmatch; | 770 | return bestmatch; |
| 771 | if (matchcount == 1 && bestmatchsize == SCHARS (file)) | 771 | /* Return t if the supplied string is an exact match (counting case); |
| 772 | it does not require any change to be made. */ | ||
| 773 | if (matchcount == 1 && !NILP (Fequal (bestmatch, file))) | ||
| 772 | return Qt; | 774 | return Qt; |
| 773 | bestmatch = Fsubstring (bestmatch, make_number (0), | 775 | bestmatch = Fsubstring (bestmatch, make_number (0), |
| 774 | make_number (bestmatchsize)); | 776 | make_number (bestmatchsize)); |