diff options
| author | Richard M. Stallman | 1996-05-09 23:21:54 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-05-09 23:21:54 +0000 |
| commit | f5ec5d3d8c9c39ef005d28f33056ed57615bf3ea (patch) | |
| tree | 96222dba7a3fb0571c3d3a6b38cea5b5cefb2339 /src | |
| parent | 227d2bed6303ced24f5ac1ea4306be685d8665f9 (diff) | |
| download | emacs-f5ec5d3d8c9c39ef005d28f33056ed57615bf3ea.tar.gz emacs-f5ec5d3d8c9c39ef005d28f33056ed57615bf3ea.zip | |
Comment changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dired.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/dired.c b/src/dired.c index cce03607de2..29027718da4 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -453,6 +453,8 @@ file_name_completion (file, dirname, all_flag, ver_flag) | |||
| 453 | use it as the best match rather than one that is not | 453 | use it as the best match rather than one that is not |
| 454 | an exact match. This way, we get the case pattern | 454 | an exact match. This way, we get the case pattern |
| 455 | of the actual match. */ | 455 | of the actual match. */ |
| 456 | /* This tests that the current file is an exact match | ||
| 457 | but BESTMATCH is not (it is too long). */ | ||
| 456 | if ((matchsize == len | 458 | if ((matchsize == len |
| 457 | && matchsize + !!directoryp | 459 | && matchsize + !!directoryp |
| 458 | < XSTRING (bestmatch)->size) | 460 | < XSTRING (bestmatch)->size) |
| @@ -460,13 +462,15 @@ file_name_completion (file, dirname, all_flag, ver_flag) | |||
| 460 | /* If there is no exact match ignoring case, | 462 | /* If there is no exact match ignoring case, |
| 461 | prefer a match that does not change the case | 463 | prefer a match that does not change the case |
| 462 | of the input. */ | 464 | of the input. */ |
| 465 | /* If there is more than one exact match aside from | ||
| 466 | case, and one of them is exact including case, | ||
| 467 | prefer that one. */ | ||
| 468 | /* This == checks that, of current file and BESTMATCH, | ||
| 469 | either both or neither are exact. */ | ||
| 463 | (((matchsize == len) | 470 | (((matchsize == len) |
| 464 | == | 471 | == |
| 465 | (matchsize + !!directoryp | 472 | (matchsize + !!directoryp |
| 466 | == XSTRING (bestmatch)->size)) | 473 | == XSTRING (bestmatch)->size)) |
| 467 | /* If there is more than one exact match aside from | ||
| 468 | case, and one of them is exact including case, | ||
| 469 | prefer that one. */ | ||
| 470 | && !bcmp (p2, XSTRING (file)->data, XSTRING (file)->size) | 474 | && !bcmp (p2, XSTRING (file)->data, XSTRING (file)->size) |
| 471 | && bcmp (p1, XSTRING (file)->data, XSTRING (file)->size))) | 475 | && bcmp (p1, XSTRING (file)->data, XSTRING (file)->size))) |
| 472 | { | 476 | { |