Mercurial > emacs
changeset 49922:d278896aa13f
(directory_files_internal): Don't expand directory.
(Fdirectory_files, Fdirectory_files_and_attributes): Do it here
instead. From Lars Hansen <larsh@math.ku.dk>.
| author | Kai Großjohann <kgrossjo@eu.uu.net> |
|---|---|
| date | Sun, 23 Feb 2003 10:48:29 +0000 |
| parents | 2c09d1b69ca7 |
| children | 6977eaede7a8 |
| files | src/ChangeLog src/dired.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Feb 23 09:52:06 2003 +0000 +++ b/src/ChangeLog Sun Feb 23 10:48:29 2003 +0000 @@ -1,3 +1,9 @@ +2003-02-23 Kai Gro,A_(Bjohann <kai.grossjohann@uni-duisburg.de> + + * dired.c (directory_files_internal): Don't expand directory. + (Fdirectory_files, Fdirectory_files_and_attributes): Do it here + instead. From Lars Hansen <larsh@math.ku.dk>. + 2003-02-22 Stefan Monnier <monnier@cs.yale.edu> * fns.c (string_to_multibyte): Remove unused var i.
--- a/src/dired.c Sun Feb 23 09:52:06 2003 +0000 +++ b/src/dired.c Sun Feb 23 10:48:29 2003 +0000 @@ -153,7 +153,6 @@ Ffuncall, and cause a GC. */ list = encoded_directory = dirfilename = Qnil; GCPRO5 (match, directory, list, dirfilename, encoded_directory); - directory = Fexpand_file_name (directory, Qnil); dirfilename = Fdirectory_file_name (directory); if (!NILP (match)) @@ -345,6 +344,7 @@ Lisp_Object directory, full, match, nosort; { Lisp_Object handler; + directory = Fexpand_file_name (directory, Qnil); /* If the file name has special constructs in it, call the corresponding file handler. */ @@ -378,6 +378,7 @@ Lisp_Object directory, full, match, nosort; { Lisp_Object handler; + directory = Fexpand_file_name (directory, Qnil); /* If the file name has special constructs in it, call the corresponding file handler. */