1 files changed, 2 insertions, 1 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 979c9f872f0..b5e9318c10b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3951,7 +3951,8 @@ init_buffer ()
 
   /* If PWD is accurate, use it instead of calling getwd.  This is faster
      when PWD is right, and may avoid a fatal error.  */
-  if ((pwd = getenv ("PWD")) != 0 && IS_DIRECTORY_SEP (*pwd)
+  if ((pwd = getenv ("PWD")) != 0
+      && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
       && stat (pwd, &pwdstat) == 0
       && stat (".", &dotstat) == 0
       && dotstat.st_ino == pwdstat.st_ino