# HG changeset patch
# User Kai Gro���johann <kgrossjo@eu.uu.net>
# Date 1045997309 0
# Node ID d278896aa13fe9a96a0b497d1e07ee2b2dab63cb
# Parent  2c09d1b69ca7c9b8c67def8b82bd076de0f9b99b
(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 -r 2c09d1b69ca7 -r d278896aa13f src/ChangeLog
--- 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.
diff -r 2c09d1b69ca7 -r d278896aa13f src/dired.c
--- 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.  */