diff options
| author | Kai Großjohann <kgrossjo@eu.uu.net> | 2003-02-23 10:48:29 +0000 |
|---|---|---|
| committer | Kai Großjohann <kgrossjo@eu.uu.net> | 2003-02-23 10:48:29 +0000 |
| commit | 4ece81a62f81dfef3080f038d71ec74dda2562b2 (patch) | |
| tree | 4fc99ed202afea43d413230ff32ff72496a40f2a /src/dired.c | |
| parent | 88e62d8875fd3db6ff97ced431bd6b1c3cea7148 (diff) | |
| download | emacs-4ece81a62f81dfef3080f038d71ec74dda2562b2.tar.gz emacs-4ece81a62f81dfef3080f038d71ec74dda2562b2.tar.bz2 emacs-4ece81a62f81dfef3080f038d71ec74dda2562b2.zip | |
(directory_files_internal): Don't expand directory.
(Fdirectory_files, Fdirectory_files_and_attributes): Do it here
instead. From Lars Hansen <larsh@math.ku.dk>.
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dired.c b/src/dired.c index 54f96ba82f1..bf2a0e4e020 100644 --- a/src/dired.c +++ b/src/dired.c @@ -153,7 +153,6 @@ directory_files_internal (directory, full, match, nosort, attrs) 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 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable. 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 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable. 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. */ |