summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2001-07-12 16:29:51 +0000
committerEli Zaretskii <eliz@gnu.org>2001-07-12 16:29:51 +0000
commit1c56232f0d2082cafc8f95b822c0114dfaaf67d6 (patch)
tree87cd76b3778befc4a65933391d0209b082707b26
parent1d2b2268355e41ec2de05d05bb15c9cd54c26b30 (diff)
downloademacs-1c56232f0d2082cafc8f95b822c0114dfaaf67d6.tar.gz
(file_name_completion): Pass dp->d_name to
Fstring_match, not elt, which is alays nil here.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dired.c3
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 @@
+2001-07-12 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * dired.c (file_name_completion): Pass dp->d_name to
+ Fstring_match, not elt, which is always nil here.
+
2001-07-12 Gerd Moellmann <gerd@gnu.org>
* 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)
for (regexps = Vcompletion_regexp_list; CONSP (regexps);
regexps = XCDR (regexps))
{
- tem = Fstring_match (XCAR (regexps), elt, zero);
+ tem = Fstring_match (XCAR (regexps),
+ make_string (dp->d_name, len), zero);
if (NILP (tem))
break;
}