From: Glenn Morris <rgm@gnu.org>
Date: Thu, 1 Jun 2017 01:13:40 +0000 (-0400)
Subject: Use true names for invocation- and source-directory
X-Git-Tag: emacs-26.0.90~521^2~206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6aacd4fb09517b0dedf62333f0e27b28e8732f63;p=emacs.git

Use true names for invocation- and source-directory

* src/emacs.c (init_cmdargs) <Vinvocation_directory>:
* src/lread.c (init_lread) <Vsource_directory>: Use true names.
---

diff --git a/src/emacs.c b/src/emacs.c
index 6ed16e80372..49ebb817678 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -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
diff --git a/src/lread.c b/src/lread.c
index 9e2168e7db4..368b86e8189 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -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.  */