aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorKaroly Lorentey2005-12-29 01:28:33 +0000
committerKaroly Lorentey2005-12-29 01:28:33 +0000
commit5990851d423fbd407f2d8cb4eb09b1fdc0b3c44e (patch)
tree3576481025a018195a655faa39652bc57f3f2f04 /src/emacs.c
parentb2a300dc19a9449c4b8b0138937193ac36b39b1c (diff)
downloademacs-5990851d423fbd407f2d8cb4eb09b1fdc0b3c44e.tar.gz
emacs-5990851d423fbd407f2d8cb4eb09b1fdc0b3c44e.zip
Fix semantics of let-binding `process-environment'.
* lisp/env.el: Require cl for byte compilation. (For `block' and `return'.) (read-envvar-name): Update for rename. Include `process-environment' as well. (setenv): Update for rename also handle `process-environment'. Update doc. (getenv): Update doc. (environment): New function. (let-environment): New macro. * lisp/font-lock.el (lisp-font-lock-keywords-2): Add `let-environment'. * src/callproc.c (Vglobal_environment): New variable, taking over the previous role of `Vprocess_environment', which is now something else. (add_env): New function. (child_setup): Use it. (child_setup, getenv_internal): Rename Vprocess_environment to Vglobal_environment. Handle the new Vprocess_environment. (Fgetenv_internal, egetenv): Update doc. (set_process_environment): Rename to `set_global_environment'. Rename Vprocess_environment to Vglobal_environment. (syms_of_callproc): Rename process-environment to global-environment, add new process-environment, update docs. * src/emacs.c (main): Call set_global_environment instead of set_process_environment. * fileio.c (Fread_file_name): Update comment. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-465
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 28b5f374ccd..142da86df95 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1515,10 +1515,10 @@ main (argc, argv
1515 /* egetenv is a pretty low-level facility, which may get called in 1515 /* egetenv is a pretty low-level facility, which may get called in
1516 many circumstances; it seems flimsy to put off initializing it 1516 many circumstances; it seems flimsy to put off initializing it
1517 until calling init_callproc. */ 1517 until calling init_callproc. */
1518 set_process_environment (); 1518 set_global_environment ();
1519 /* AIX crashes are reported in system versions 3.2.3 and 3.2.4 1519 /* AIX crashes are reported in system versions 3.2.3 and 3.2.4
1520 if this is not done. Do it after set_process_environment so that we 1520 if this is not done. Do it after set_global_environment so that we
1521 don't pollute Vprocess_environment. */ 1521 don't pollute Vglobal_environment. */
1522 /* Setting LANG here will defeat the startup locale processing... */ 1522 /* Setting LANG here will defeat the startup locale processing... */
1523#ifdef AIX3_2 1523#ifdef AIX3_2
1524 putenv ("LANG=C"); 1524 putenv ("LANG=C");