emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 6aacd4f: Use true names for invocation- and source-


From: Glenn Morris
Subject: [Emacs-diffs] master 6aacd4f: Use true names for invocation- and source-directory
Date: Wed, 31 May 2017 21:13:54 -0400 (EDT)

branch: master
commit 6aacd4fb09517b0dedf62333f0e27b28e8732f63
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    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.
---
 src/emacs.c | 3 +++
 src/lread.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/emacs.c b/src/emacs.c
index 6ed16e8..49ebb81 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 9e2168e..368b86e 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.  */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]