[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104443: Make it possible to run ./te
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104443: Make it possible to run ./temacs. |
Date: |
Mon, 30 May 2011 22:12:19 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104443
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-30 22:12:19 -0700
message:
Make it possible to run ./temacs.
* callproc.c (set_initial_environment): Remove CANNOT_DUMP code,
syms_of_callproc does the same thing. Remove test for
"initialized", do it in the caller.
* emacs.c (main): Avoid calling set_initial_environment when dumping.
modified:
src/ChangeLog
src/callproc.c
src/emacs.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-05-31 03:03:38 +0000
+++ b/src/ChangeLog 2011-05-31 05:12:19 +0000
@@ -1,3 +1,12 @@
+2011-05-31 Dan Nicolaescu <address@hidden>
+
+ Make it possible to run ./temacs.
+
+ * callproc.c (set_initial_environment): Remove CANNOT_DUMP code,
+ syms_of_callproc does the same thing. Remove test for
+ "initialized", do it in the caller.
+ * emacs.c (main): Avoid calling set_initial_environment when dumping.
+
2011-05-31 Stefan Monnier <address@hidden>
* minibuf.c (Finternal_complete_buffer): Return `category' metadata.
=== modified file 'src/callproc.c'
--- a/src/callproc.c 2011-05-20 09:47:59 +0000
+++ b/src/callproc.c 2011-05-31 05:12:19 +0000
@@ -1603,20 +1603,13 @@
void
set_initial_environment (void)
{
- register char **envp;
-#ifdef CANNOT_DUMP
- Vprocess_environment = Qnil;
-#else
- if (initialized)
-#endif
- {
- for (envp = environ; *envp; envp++)
- Vprocess_environment = Fcons (build_string (*envp),
- Vprocess_environment);
- /* Ideally, the `copy' shouldn't be necessary, but it seems it's frequent
- to use `delete' and friends on process-environment. */
- Vinitial_environment = Fcopy_sequence (Vprocess_environment);
- }
+ char **envp;
+ for (envp = environ; *envp; envp++)
+ Vprocess_environment = Fcons (build_string (*envp),
+ Vprocess_environment);
+ /* Ideally, the `copy' shouldn't be necessary, but it seems it's frequent
+ to use `delete' and friends on process-environment. */
+ Vinitial_environment = Fcopy_sequence (Vprocess_environment);
}
void
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2011-05-29 04:08:28 +0000
+++ b/src/emacs.c 2011-05-31 05:12:19 +0000
@@ -1423,8 +1423,11 @@
syms_of_callproc ();
/* egetenv is a pretty low-level facility, which may get called in
many circumstances; it seems flimsy to put off initializing it
- until calling init_callproc. */
- set_initial_environment ();
+ until calling init_callproc. Do not do it when dumping. */
+ if (initialized || ((strcmp (argv[argc-1], "dump") != 0
+ && strcmp (argv[argc-1], "bootstrap") != 0)))
+ set_initial_environment ();
+
/* AIX crashes are reported in system versions 3.2.3 and 3.2.4
if this is not done. Do it after set_global_environment so that we
don't pollute Vglobal_environment. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104443: Make it possible to run ./temacs.,
Dan Nicolaescu <=