From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 20 Jan 1995 23:36:07 +0000 (+0000)
Subject: (file_name_as_directory, Ffile_name_directory)
X-Git-Tag: emacs-19.34~5359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dffb28c7ca5aa40dda40cfac9a26a38bcfefe1c7;p=emacs.git

(file_name_as_directory, Ffile_name_directory)
(Ffile_name_nondirectory): Delete special MSDOG code now covered by macros.
---

diff --git a/src/fileio.c b/src/fileio.c
index 079c7d0dc7c..d47a17c0536 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -306,9 +306,6 @@ on VMS, perhaps instead a string ending in `:', `]' or `>'.")
 #ifdef VMS
 	 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
 #endif /* VMS */
-#ifdef MSDOS
-	 && p[-1] != ':' && p[-1] != '\\'
-#endif
 	 ) p--;
 
   if (p == beg)
@@ -372,9 +369,6 @@ or the entire name if it contains no slash.")
 #ifdef VMS
 	 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
 #endif /* VMS */
-#ifdef MSDOS
-	 && p[-1] != ':'
-#endif
 	 ) p--;
 
   return make_string (p, end - p);
@@ -470,15 +464,11 @@ file_name_as_directory (out, in)
     }
 #else /* not VMS */
   /* For Unix syntax, Append a slash if necessary */
-#ifdef MSDOS
-  if (out[size] != ':' && out[size] != '/' && out[size] != '\\')
-#else /* not MSDOS */
   if (!IS_ANY_SEP (out[size]))
     {
       out[size + 1] = DIRECTORY_SEP;
       out[size + 2] = '\0';
     }
-#endif /* not MSDOS */
 #endif /* not VMS */
   return out;
 }