2 files changed, 14 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 66dc0406443..dc474221503 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fexpand_file_name) [DOS_NT]: Don't try to support
+        "superroot" on DOS_NT systems.
+
 2005-05-21  David Hunter  <hunterd42@comcast.net>  (tiny change)
 
         * process.c (send_process): Restore the SIGPIPE handler if we
diff --git a/src/fileio.c b/src/fileio.c
index 0956fb9d134..4dac185ac81 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1651,8 +1651,16 @@ See also the function `substitute-in-file-name'.  */)
           p += 2;
         }
       else if (IS_DIRECTORY_SEP (p[0]) && p[1] == '.' && p[2] == '.'
-               /* `/../' is the "superroot" on certain file systems.  */
+               /* `/../' is the "superroot" on certain file systems.
+                  Turned off on DOS_NT systems because they have no
+                  "superroot" and because this causes us to produce
+                  file names like "d:/../foo" which fail file-related
+                  functions of the underlying OS.  (To reproduce, try a
+                  long series of "../../" in default_directory, longer
+                  than the number of levels from the root.)  */
+#ifndef DOS_NT
                && o != target
+#endif
                && (IS_DIRECTORY_SEP (p[3]) || p[3] == 0))
         {
           while (o != target && (--o) && !IS_DIRECTORY_SEP (*o))