diff options
| author | Glenn Morris | 2017-05-31 21:13:40 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-05-31 21:13:40 -0400 |
| commit | 6aacd4fb09517b0dedf62333f0e27b28e8732f63 (patch) | |
| tree | 17a205e55ecf73bfa3de6aa963dcea341f9ed0da | |
| parent | c4ecc01a45c6dd183f0ecf65e4c4c2c39beea278 (diff) | |
| download | emacs-6aacd4fb09517b0dedf62333f0e27b28e8732f63.tar.gz emacs-6aacd4fb09517b0dedf62333f0e27b28e8732f63.zip | |
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.
| -rw-r--r-- | src/emacs.c | 3 | ||||
| -rw-r--r-- | src/lread.c | 3 |
2 files changed, 6 insertions, 0 deletions
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) | |||
| 463 | 463 | ||
| 464 | if (!NILP (Vinvocation_directory)) | 464 | if (!NILP (Vinvocation_directory)) |
| 465 | { | 465 | { |
| 466 | if (NILP (Vpurify_flag) && !NILP (Ffboundp (Qfile_truename))) | ||
| 467 | Vinvocation_directory = call1 (Qfile_truename, Vinvocation_directory); | ||
| 468 | |||
| 466 | dir = Vinvocation_directory; | 469 | dir = Vinvocation_directory; |
| 467 | #ifdef WINDOWSNT | 470 | #ifdef WINDOWSNT |
| 468 | /* If we are running from the build directory, set DIR to the | 471 | /* 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) | |||
| 4482 | void | 4482 | void |
| 4483 | init_lread (void) | 4483 | init_lread (void) |
| 4484 | { | 4484 | { |
| 4485 | if (NILP (Vpurify_flag) && !NILP (Ffboundp (Qfile_truename))) | ||
| 4486 | Vsource_directory = call1 (Qfile_truename, Vsource_directory); | ||
| 4487 | |||
| 4485 | /* First, set Vload_path. */ | 4488 | /* First, set Vload_path. */ |
| 4486 | 4489 | ||
| 4487 | /* Ignore EMACSLOADPATH when dumping. */ | 4490 | /* Ignore EMACSLOADPATH when dumping. */ |