diff options
| author | Eli Zaretskii | 2001-07-12 16:29:51 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-07-12 16:29:51 +0000 |
| commit | 1c56232f0d2082cafc8f95b822c0114dfaaf67d6 (patch) | |
| tree | 87cd76b3778befc4a65933391d0209b082707b26 /src | |
| parent | 1d2b2268355e41ec2de05d05bb15c9cd54c26b30 (diff) | |
| download | emacs-1c56232f0d2082cafc8f95b822c0114dfaaf67d6.tar.gz emacs-1c56232f0d2082cafc8f95b822c0114dfaaf67d6.zip | |
(file_name_completion): Pass dp->d_name to
Fstring_match, not elt, which is alays nil here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dired.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 599d997b2ef..77f7b87175b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-07-12 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * dired.c (file_name_completion): Pass dp->d_name to | ||
| 4 | Fstring_match, not elt, which is always nil here. | ||
| 5 | |||
| 1 | 2001-07-12 Gerd Moellmann <gerd@gnu.org> | 6 | 2001-07-12 Gerd Moellmann <gerd@gnu.org> |
| 2 | 7 | ||
| 3 | * xselect.c (x_decline_selection_request): Handle errors | 8 | * xselect.c (x_decline_selection_request): Handle errors |
diff --git a/src/dired.c b/src/dired.c index 9deb44d3914..19150967560 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -595,7 +595,8 @@ file_name_completion (file, dirname, all_flag, ver_flag) | |||
| 595 | for (regexps = Vcompletion_regexp_list; CONSP (regexps); | 595 | for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
| 596 | regexps = XCDR (regexps)) | 596 | regexps = XCDR (regexps)) |
| 597 | { | 597 | { |
| 598 | tem = Fstring_match (XCAR (regexps), elt, zero); | 598 | tem = Fstring_match (XCAR (regexps), |
| 599 | make_string (dp->d_name, len), zero); | ||
| 599 | if (NILP (tem)) | 600 | if (NILP (tem)) |
| 600 | break; | 601 | break; |
| 601 | } | 602 | } |