/[emacs]/emacs/src/fileio.c
ViewVC logotype

Diff of /emacs/src/fileio.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.472 by rms, Sat Jan 25 19:48:59 2003 UTC revision 1.473 by lektu, Fri Jan 31 15:23:32 2003 UTC
# Line 2052  duplicates what `expand-file-name' does. Line 2052  duplicates what `expand-file-name' does.
2052    for (p = nm; p != endp; p++)    for (p = nm; p != endp; p++)
2053      {      {
2054        if ((p[0] == '~'        if ((p[0] == '~'
2055  #if defined (APOLLO) || defined (WINDOWSNT)  #if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
2056             /* // at start of file name is meaningful in Apollo and             /* // at start of file name is meaningful in Apollo,
2057                WindowsNT systems.  */                WindowsNT and Cygwin systems.  */
2058             || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)             || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)
2059  #else /* not (APOLLO || WINDOWSNT) */  #else /* not (APOLLO || WINDOWSNT || CYGWIN) */
2060             || IS_DIRECTORY_SEP (p[0])             || IS_DIRECTORY_SEP (p[0])
2061  #endif /* not (APOLLO || WINDOWSNT) */  #endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
2062             )             )
2063            && p != nm            && p != nm
2064            && (0            && (0
# Line 2230  duplicates what `expand-file-name' does. Line 2230  duplicates what `expand-file-name' does.
2230    
2231    for (p = xnm; p != x; p++)    for (p = xnm; p != x; p++)
2232      if ((p[0] == '~'      if ((p[0] == '~'
2233  #if defined (APOLLO) || defined (WINDOWSNT)  #if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
2234           || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)           || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)
2235  #else /* not (APOLLO || WINDOWSNT) */  #else /* not (APOLLO || WINDOWSNT || CYGWIN) */
2236           || IS_DIRECTORY_SEP (p[0])           || IS_DIRECTORY_SEP (p[0])
2237  #endif /* not (APOLLO || WINDOWSNT) */  #endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
2238           )           )
2239          && p != xnm && IS_DIRECTORY_SEP (p[-1]))          && p != xnm && IS_DIRECTORY_SEP (p[-1]))
2240        xnm = p;        xnm = p;
# Line 6116  provides a file dialog box.  */) Line 6116  provides a file dialog box.  */)
6116              (NILP (predicate) ? Qfile_exists_p : predicate));              (NILP (predicate) ? Qfile_exists_p : predicate));
6117    
6118    GCPRO2 (insdef, default_filename);    GCPRO2 (insdef, default_filename);
6119      
6120  #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK)  #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK)
6121    if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))    if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
6122        && use_dialog_box        && use_dialog_box

Legend:
Removed from v.1.472  
changed lines
  Added in v.1.473

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26