X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdired-msw.c;h=73c5d109791ec401da0e228c7205ea7390fab700;hb=ac155f65fdad732a944b5217c90d8340818e0c0a;hp=f717c650903e4935e15a2e9fc98fc1aa3a61db18;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/dired-msw.c b/src/dired-msw.c
index f717c65..73c5d10 100644
--- a/src/dired-msw.c
+++ b/src/dired-msw.c
@@ -76,11 +76,9 @@ Boston, MA 02111-1307, USA.  */
 #include "regex.h"
 
 #include "sysdir.h"
-#include "sysfile.h"
 #include "sysproc.h"
+#include "sysfile.h"
 
-#include <windows.h>
-#include <limits.h>
 #include <time.h>
 
 #include <winsock.h>		/* To make nt.h happy */
@@ -92,7 +90,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 static int mswindows_ls_sort_case_insensitive;
-static int mswindows_ls_round_file_size;
+static Fixnum mswindows_ls_round_file_size;
 
 Lisp_Object		Qmswindows_insert_directory;
 
@@ -189,7 +187,7 @@ mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
 	  /* PATTERN might be a flawed regular expression.  Rather than
 	     catching and signalling our own errors, we just call
 	     compile_pattern to do the work for us.  */
-	  bufp = compile_pattern (pattern, 0, 0, 0, ERROR_ME);
+	  bufp = compile_pattern (pattern, 0, Qnil, 0, ERROR_ME);
 	}
       /* Now *bufp is the compiled form of PATTERN; don't call anything
 	 which might compile a new regexp until we're done with the loop! */
@@ -210,9 +208,9 @@ mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
 
       /*
        * Here, we use FindFirstFile()/FindNextFile() instead of opendir(),
-       * stat(), & friends, because stat() is VERY expensive in terms of
-       * time.  Hence, we take the time to write complicated Win32-specific
-       * code, instead of simple Unix-style stuff.
+       * xemacs_stat(), & friends, because xemacs_stat() is VERY expensive in
+       * terms of time.  Hence, we take the time to write complicated
+       * Win32-specific code, instead of simple Unix-style stuff.
        */
       findex = 0;
       fh = INVALID_HANDLE_VALUE;
@@ -319,14 +317,14 @@ mswindows_format_file (WIN32_FIND_DATA *file, char *buf, int display_size,
       cptr[1] = cptr[4] = cptr[7] = 'w';
     }
   if ((file->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ||
-      len > 4 &&
-      (_stricmp(&file->cFileName[len - 4], ".exe") == 0
-       || _stricmp(&file->cFileName[len - 4], ".com") == 0
-       || _stricmp(&file->cFileName[len - 4], ".bat") == 0
+      (len > 4 &&
+       (_stricmp(&file->cFileName[len - 4], ".exe") == 0
+	|| _stricmp(&file->cFileName[len - 4], ".com") == 0
+	|| _stricmp(&file->cFileName[len - 4], ".bat") == 0
 #if 0
-       || _stricmp(&file->cFileName[len - 4], ".pif") == 0
+	|| _stricmp(&file->cFileName[len - 4], ".pif") == 0
 #endif
-       ))
+	)))
     {
       cptr[2] = cptr[5] = cptr[8] = 'x';
     } else {
@@ -639,7 +637,7 @@ syms_of_dired_mswindows (void)
 void
 vars_of_dired_mswindows (void)
 {
-  DEFVAR_BOOL ("mswindows-ls-sort-case-insensitive", &mswindows_ls_sort_case_insensitive, /*
+  DEFVAR_BOOL ("mswindows-ls-sort-case-insensitive", &mswindows_ls_sort_case_insensitive /*
 *Non-nil means filenames are sorted in a case-insensitive fashion.
 Nil means filenames are sorted in a case-sensitive fashion, just like Unix.
 */ );