diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-07-03 04:53:21 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-07-03 04:53:21 +0000 |
| commit | de87fb5978903768aff3c71857ebca173461bea3 (patch) | |
| tree | a730da52bd15d248d83d5a897c462bc2c2b3a65b /lisp/env.el | |
| parent | 5f06b6081389843ba2d2d817683eb4e610f7a24e (diff) | |
| download | emacs-de87fb5978903768aff3c71857ebca173461bea3.tar.gz emacs-de87fb5978903768aff3c71857ebca173461bea3.tar.bz2 emacs-de87fb5978903768aff3c71857ebca173461bea3.zip | |
* server.el (server-process-filter): Likewise.
(server-process-filter): Likewise. Also set COLORFGBG and
COLORTERM.
* frame.el (frame-initialize, make-frame): Likewise.
* faces.el (tty-set-up-initial-frame-faces): Likewise.
* env.el (read-envvar-name): Don't consider the environment frame
param.
(setenv): Set display-environment-variable and
term-environment-variable.
* frame.c (Qterm_environment_variable,
Qdisplay_environment_variable): New variables.
(syms_of_frame): Intern and staticpro them.
* frame.h: Declare them here.
* callproc.c (child_setup): Use the display-environment-variable
and term-environment-variable frame params.
(getenv_internal): Likewise.
(set_initial_environment): Initialise Vprocess_environment.
* frames.texi (Basic Parameters): Add display-environment-variable
and term-environment-variable.
Diffstat (limited to 'lisp/env.el')
| -rw-r--r-- | lisp/env.el | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/env.el b/lisp/env.el index a6626dc08ff..f2609cc6784 100644 --- a/lisp/env.el +++ b/lisp/env.el @@ -55,7 +55,8 @@ If it is also not t, RET does not exit if it does non-null completion." (substring enventry 0 (string-match "=" enventry))))) (append process-environment - (frame-parameter (frame-with-environment) 'environment))) + nil ;;(frame-parameter (frame-with-environment) 'environment) + )) nil mustmatch nil 'read-envvar-name-history)) ;; History list for VALUE argument to setenv. @@ -191,9 +192,14 @@ a side-effect." (setq process-environment (setenv-internal process-environment variable value t)) (setq frame (frame-with-environment frame)) - (set-frame-parameter frame 'environment - (setenv-internal (frame-parameter frame 'environment) - variable value nil))) + (cond + ((string-equal "TERM" variable) + (set-frame-parameter frame 'term-environment-variable value)) + ((string-equal "DISPLAY" variable) + (set-frame-parameter frame 'display-environment-variable value)) + (t + (setq process-environment (setenv-internal process-environment + variable value nil))))) value) (defun getenv (variable &optional frame) @@ -238,8 +244,8 @@ Non-ASCII characters are encoded according to the initial value of `locale-coding-system', i.e. the elements must normally be decoded for use. See `setenv' and `getenv'." (let* ((env (append process-environment - (frame-parameter (frame-with-environment frame) - 'environment) +;; (frame-parameter (frame-with-environment frame) +;; 'environment) nil)) (scan env) prev seen) |