From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 8 Aug 1993 05:17:22 +0000 (+0000)
Subject: (expand_and_dir_to_file): Use Fdirectory_file_name.
X-Git-Tag: emacs-19.34~11368
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ddc61f4653039b1103f4eb2a5ce8f5ed3eb2a511;p=emacs.git

(expand_and_dir_to_file): Use Fdirectory_file_name.
---

diff --git a/src/fileio.c b/src/fileio.c
index 6a94b2c34da..b9a7dc478bb 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1526,8 +1526,8 @@ expand_and_dir_to_file (filename, defdir)
      stat behaves differently depending!  */
   if (XSTRING (abspath)->size > 1
       && XSTRING (abspath)->data[XSTRING (abspath)->size - 1] == '/')
-    abspath = Fsubstring (abspath, make_number (0),
-			  make_number (XSTRING (abspath)->size - 1));
+    /* We cannot take shortcuts; they might be wrong for magic file names.  */
+    abspath = Fdirectory_file_name (abspath);
 #endif
   return abspath;
 }