(directory_files_internal): Don't expand directory.

(Fdirectory_files, Fdirectory_files_and_attributes): Do it here
instead.  From Lars Hansen <larsh@math.ku.dk>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 40d5ffc48a5f5282044144b52e060132a61b10a7..7d27e0b53d82c21e53c53c172725fcb228f68daa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-23  Kai Gro\e,A_\e(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.

diff --git a/src/dired.c b/src/dired.c
index 54f96ba82f1f96a6fd26d67df7b3fd1f35847b3d..bf2a0e4e02076c9e5f105daccbc8f5f28dca4baf 100644 (file)
--- 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.  */