diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-26 02:14:10 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-26 02:14:10 +0000 |
| commit | f105f403d206f95bf534226abb99f14aa2f3052e (patch) | |
| tree | d326884972abd85997fc9e688e0fefa60a3ec977 /lisp/term/rxvt.el | |
| parent | ed8dad6b616204b4dd4e853801f41da6f4c3b0a7 (diff) | |
| download | emacs-f105f403d206f95bf534226abb99f14aa2f3052e.tar.gz | |
Implement automatic terminal-local environment variables via `local-environment-variables'.
* lisp/env.el (setenv, getenv): Add optional terminal parameter. Update docs.
(setenv): Handle `local-environment-variables'.
(read-envvar-name): Also allow (and complete) local
environment variables on the current terminal.
* src/callproc.c: Include frame.h and termhooks.h, for terminal parameters.
(Qenvironment): New constant.
(Vlocal_environment_variables): New variable.
(syms_of_callproc): Register and initialize them.
(child_setup): Handle Vlocal_environment_variables.
(getenv_internal): Add terminal parameter. Handle
Vlocal_environment_variables.
(Fgetenv_internal): Add terminal parameter.
* src/termhooks.h (get_terminal_param): Declare.
* src/Makefile.in (callproc.o): Update dependencies.
* mac/makefile.MPW (callproc.c.x): Update dependencies.
* lisp/termdev.el (terminal-id): Make parameter optional.
(terminal-getenv, terminal-setenv, with-terminal-environment):
Disable functions.
* lisp/mule-cmds.el (set-locale-environment): Convert `terminal-getenv' calls
to `getenv'.
* lisp/rxvt.el (rxvt-set-background-mode): Ditto.
* lisp/x-win.el (x-initialize-window-system): Ditto.
* lisp/xterm.el (terminal-init-xterm): Ditto.
* lisp/server.el (server-process-filter): Fix reference to the 'display frame
parameter.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-461
Diffstat (limited to 'lisp/term/rxvt.el')
| -rw-r--r-- | lisp/term/rxvt.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index e7e92e70042..79994403301 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -291,7 +291,7 @@ for the currently selected frame." ;; intelligent way than the default guesswork in startup.el. (defun rxvt-set-background-mode () "Set background mode as appropriate for the default rxvt colors." - (let ((fgbg (terminal-getenv "COLORFGBG")) + (let ((fgbg (getenv "COLORFGBG" (terminal-id))) bg rgb) (setq default-frame-background-mode 'light) (when (and fgbg |