]> git.eshelyaron.com Git - emacs.git/commit
Always set 'Vexec_path' before 'Vinvocation_directory' (bug#43137)
authorAndrea Corallo <akrl@sdf.org>
Sat, 26 Sep 2020 13:12:30 +0000 (15:12 +0200)
committerAndrea Corallo <akrl@sdf.org>
Sat, 26 Sep 2020 13:46:31 +0000 (15:46 +0200)
commitdc0cf16c7a60f36aafcf9b56513a855cefa7e1ad
treeb56d844da0d424bde63c9897f8e46249577d2fe3
parent29a8d9303bd3098eed88f3eb7394b66ae28cc887
Always set 'Vexec_path' before 'Vinvocation_directory' (bug#43137)

Do this as depending on the OS if argv0 is not populated 'Vexec_path'
is used to infer 'Vinvocation_directory'.

      * src/pdumper.c (pdumper_load): Invoke 'init_vars_for_load' instead
of 'set_invocation_vars'.

* src/lisp.h: Extern 'init_vars_for_load' instead of
'set_invocation_vars' .

* src/emacs.c (set_invocation_vars): Make it static and remove
double invocation guard.
(init_vars_for_load): Wrap 'init_callproc_1' and 'set_invocation_vars'
calls + add double invocation guard.
(init_cmdargs): Move out 'set_invocation_vars' invocation.
(main): Call 'init_vars_for_load' instead of 'init_callproc_1'.
src/emacs.c
src/lisp.h
src/pdumper.c