aboutsummaryrefslogtreecommitdiffstats
path: root/src/fileio.c
diff options
context:
space:
mode:
authorJuanma Barranquero2003-01-31 15:24:20 +0000
committerJuanma Barranquero2003-01-31 15:24:20 +0000
commitc60ee5e70f7ae20f1bbf7d0e2d36f40658f3dff1 (patch)
tree7d28300d64e41bf2aeed37bc8f1293f9fc52a36a /src/fileio.c
parent2454c12d458c60b871f6f36c3fd6ba752aad61bf (diff)
downloademacs-c60ee5e70f7ae20f1bbf7d0e2d36f40658f3dff1.tar.gz
emacs-c60ee5e70f7ae20f1bbf7d0e2d36f40658f3dff1.zip
Cygwin support patch.
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fileio.c b/src/fileio.c
index b3fcda88e98..72c9faccddd 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2052,13 +2052,13 @@ duplicates what `expand-file-name' does. */)
2052 for (p = nm; p != endp; p++) 2052 for (p = nm; p != endp; p++)
2053 { 2053 {
2054 if ((p[0] == '~' 2054 if ((p[0] == '~'
2055#if defined (APOLLO) || defined (WINDOWSNT) 2055#if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
2056 /* // at start of file name is meaningful in Apollo and 2056 /* // at start of file name is meaningful in Apollo,
2057 WindowsNT systems. */ 2057 WindowsNT and Cygwin systems. */
2058 || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm) 2058 || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)
2059#else /* not (APOLLO || WINDOWSNT) */ 2059#else /* not (APOLLO || WINDOWSNT || CYGWIN) */
2060 || IS_DIRECTORY_SEP (p[0]) 2060 || IS_DIRECTORY_SEP (p[0])
2061#endif /* not (APOLLO || WINDOWSNT) */ 2061#endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
2062 ) 2062 )
2063 && p != nm 2063 && p != nm
2064 && (0 2064 && (0
@@ -2230,11 +2230,11 @@ duplicates what `expand-file-name' does. */)
2230 2230
2231 for (p = xnm; p != x; p++) 2231 for (p = xnm; p != x; p++)
2232 if ((p[0] == '~' 2232 if ((p[0] == '~'
2233#if defined (APOLLO) || defined (WINDOWSNT) 2233#if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
2234 || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm) 2234 || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)
2235#else /* not (APOLLO || WINDOWSNT) */ 2235#else /* not (APOLLO || WINDOWSNT || CYGWIN) */
2236 || IS_DIRECTORY_SEP (p[0]) 2236 || IS_DIRECTORY_SEP (p[0])
2237#endif /* not (APOLLO || WINDOWSNT) */ 2237#endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
2238 ) 2238 )
2239 && p != xnm && IS_DIRECTORY_SEP (p[-1])) 2239 && p != xnm && IS_DIRECTORY_SEP (p[-1]))
2240 xnm = p; 2240 xnm = p;
@@ -6116,7 +6116,7 @@ provides a file dialog box. */)
6116 (NILP (predicate) ? Qfile_exists_p : predicate)); 6116 (NILP (predicate) ? Qfile_exists_p : predicate));
6117 6117
6118 GCPRO2 (insdef, default_filename); 6118 GCPRO2 (insdef, default_filename);
6119 6119
6120#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) 6120#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK)
6121 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) 6121 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
6122 && use_dialog_box 6122 && use_dialog_box