]> git.eshelyaron.com Git - emacs.git/commitdiff
Use true names for invocation- and source-directory
authorGlenn Morris <rgm@gnu.org>
Thu, 1 Jun 2017 01:13:40 +0000 (21:13 -0400)
committerGlenn Morris <rgm@gnu.org>
Thu, 1 Jun 2017 01:13:40 +0000 (21:13 -0400)
* src/emacs.c (init_cmdargs) <Vinvocation_directory>:
* src/lread.c (init_lread) <Vsource_directory>: Use true names.

src/emacs.c
src/lread.c

index 6ed16e803727c0c2640bfc790725b43e18ac34a5..49ebb81767840699e10b4b0fc53a8a2033f0a75c 100644 (file)
@@ -463,6 +463,9 @@ init_cmdargs (int argc, char **argv, int skip_args, char *original_pwd)
 
   if (!NILP (Vinvocation_directory))
     {
+      if (NILP (Vpurify_flag) && !NILP (Ffboundp (Qfile_truename)))
+        Vinvocation_directory = call1 (Qfile_truename, Vinvocation_directory);
+
       dir = Vinvocation_directory;
 #ifdef WINDOWSNT
       /* If we are running from the build directory, set DIR to the
index 9e2168e7db49678936b228f4f4e8f5cca0b21e02..368b86e8189e9791b9e7cddd9d9db715f488523c 100644 (file)
@@ -4482,6 +4482,9 @@ load_path_default (void)
 void
 init_lread (void)
 {
+  if (NILP (Vpurify_flag) && !NILP (Ffboundp (Qfile_truename)))
+    Vsource_directory = call1 (Qfile_truename, Vsource_directory);
+
   /* First, set Vload_path.  */
 
   /* Ignore EMACSLOADPATH when dumping.  */