Commit 4ece81a6 authored by Kai Großjohann's avatar Kai Großjohann
Browse files

(directory_files_internal): Don't expand directory.

(Fdirectory_files, Fdirectory_files_and_attributes): Do it here
instead.  From Lars Hansen <larsh@math.ku.dk>.
parent 88e62d88
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.
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment