projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply new glyph-image conventions for `ucs@*', `adobe-japan1-*',
[chise/xemacs-chise.git-]
/
src
/
dired-msw.c
diff --git
a/src/dired-msw.c
b/src/dired-msw.c
index
a652937
..
791ed06
100644
(file)
--- a/
src/dired-msw.c
+++ b/
src/dired-msw.c
@@
-173,6
+173,7
@@
mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
int findex, len;
char win32pattern[MAXNAMLEN+3];
HANDLE fh;
int findex, len;
char win32pattern[MAXNAMLEN+3];
HANDLE fh;
+ int errm;
/*
* Much of the following code and comments were taken from dired.c.
/*
* Much of the following code and comments were taken from dired.c.
@@
-214,6
+215,8
@@
mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
*/
findex = 0;
fh = INVALID_HANDLE_VALUE;
*/
findex = 0;
fh = INVALID_HANDLE_VALUE;
+ errm = SetErrorMode (SEM_FAILCRITICALERRORS
+ | SEM_NOOPENFILEERRORBOX);
while (1)
{
while (1)
{
@@
-226,6
+229,7
@@
mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
fh = FindFirstFile(win32pattern, &files[findex]);
if (fh == INVALID_HANDLE_VALUE)
{
fh = FindFirstFile(win32pattern, &files[findex]);
if (fh == INVALID_HANDLE_VALUE)
{
+ SetErrorMode (errm);
report_file_error ("Opening directory",
list1(build_string(dirfile)));
}
report_file_error ("Opening directory",
list1(build_string(dirfile)));
}
@@
-239,6
+243,7
@@
mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
break;
}
FindClose(fh);
break;
}
FindClose(fh);
+ SetErrorMode (errm);
report_file_error ("Reading directory",
list1(build_string(dirfile)));
}
report_file_error ("Reading directory",
list1(build_string(dirfile)));
}
@@
-277,6
+282,8
@@
mswindows_get_files (char *dirfile, int nowild, Lisp_Object pattern,
*nfiles = findex;
break;
}
*nfiles = findex;
break;
}
+
+ SetErrorMode (errm);
return (files);
}
return (files);
}