Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8b4eb796
Commit
8b4eb796
authored
May 15, 2010
by
Ken Raeburn
Browse files
* emacs.c (main): Initialize initial-environment and process-environment
before generating from env, not after.
parent
e45b9e19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
src/ChangeLog
src/ChangeLog
+3
-0
src/emacs.c
src/emacs.c
+5
-1
No files found.
src/ChangeLog
View file @
8b4eb796
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
* emacs.c (main): Initialize initial-environment and
process-environment before generating from env, not after.
Handle --version reasonably in CANNOT_DUMP configuration.
Handle --version reasonably in CANNOT_DUMP configuration.
* emacs.c (emacs_version, emacs_copyright): New string variables.
* emacs.c (emacs_version, emacs_copyright): New string variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
...
...
src/emacs.c
View file @
8b4eb796
...
@@ -1543,6 +1543,11 @@ main (int argc, char **argv)
...
@@ -1543,6 +1543,11 @@ main (int argc, char **argv)
ns_init_paths
();
ns_init_paths
();
#endif
#endif
/* Initialize and GC-protect Vinitial_environment and
Vprocess_environment before set_initial_environment fills them
in. */
if
(
!
initialized
)
syms_of_callproc
();
/* egetenv is a pretty low-level facility, which may get called in
/* egetenv is a pretty low-level facility, which may get called in
many circumstances; it seems flimsy to put off initializing it
many circumstances; it seems flimsy to put off initializing it
until calling init_callproc. */
until calling init_callproc. */
...
@@ -1592,7 +1597,6 @@ main (int argc, char **argv)
...
@@ -1592,7 +1597,6 @@ main (int argc, char **argv)
syms_of_callint
();
syms_of_callint
();
syms_of_casefiddle
();
syms_of_casefiddle
();
syms_of_casetab
();
syms_of_casetab
();
syms_of_callproc
();
syms_of_category
();
syms_of_category
();
syms_of_ccl
();
syms_of_ccl
();
syms_of_character
();
syms_of_character
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment