diff options
| author | Andreas Schwab | 2008-04-28 18:33:06 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-04-28 18:33:06 +0000 |
| commit | fb4a622af4f461c101c5d7a78481f58f7cbdae74 (patch) | |
| tree | 34dd9fe0bc96cb05ba61e462407ca2b0ed33b6da /src | |
| parent | 1a93c12fb80002737f8d9f5f5940ff47c24072cb (diff) | |
| download | emacs-fb4a622af4f461c101c5d7a78481f58f7cbdae74.tar.gz emacs-fb4a622af4f461c101c5d7a78481f58f7cbdae74.zip | |
(file_name_completion): Fix another mixing of encoded
and decoded names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dired.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cb96e30094a..28cf208dc44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-04-28 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * dired.c (file_name_completion): Fix another mixing of encoded | ||
| 4 | and decoded names. | ||
| 5 | |||
| 1 | 2008-04-28 Juanma Barranquero <lekktu@gmail.com> | 6 | 2008-04-28 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * w32fns.c (Fw32_define_rgb_color): Fix typo in docstring. | 8 | * w32fns.c (Fw32_define_rgb_color): Fix typo in docstring. |
diff --git a/src/dired.c b/src/dired.c index 3fa32b474da..dda5fdeabc6 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -756,7 +756,7 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate) | |||
| 756 | bestmatch = DECODE_FILE (bestmatch); | 756 | bestmatch = DECODE_FILE (bestmatch); |
| 757 | return bestmatch; | 757 | return bestmatch; |
| 758 | } | 758 | } |
| 759 | if (matchcount == 1 && bestmatchsize == SCHARS (file)) | 759 | if (matchcount == 1 && bestmatchsize == SCHARS (encoded_file)) |
| 760 | return Qt; | 760 | return Qt; |
| 761 | bestmatch = Fsubstring (bestmatch, make_number (0), | 761 | bestmatch = Fsubstring (bestmatch, make_number (0), |
| 762 | make_number (bestmatchsize)); | 762 | make_number (bestmatchsize)); |