Mercurial > emacs
changeset 83422:1f5d64c4df6f
Fix compilation errors in previous commit.
* src/callproc.c (getenv_internal): Fix get_terminal_param call.
* dispextern.h (get_device): Move declaration to termhooks.h.
* termhooks.h (get_device): Move here.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-462
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 26 Dec 2005 02:21:31 +0000 |
| parents | bb2edc915032 |
| children | b64b7e867d0a |
| files | README.multi-tty src/callproc.c src/dispextern.h src/termhooks.h |
| diffstat | 4 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/README.multi-tty Mon Dec 26 02:14:10 2005 +0000 +++ b/README.multi-tty Mon Dec 26 02:21:31 2005 +0000 @@ -462,7 +462,11 @@ changed in CVS, and frame.el in multi-tty has not yet been adapted for the changes. (It needs to look at default-frame-background-mode.) (Update: maybe it is fixed now; - needs testing.) + needs testing.) (Note that the byte compiler has this to say about + term/rxvt.el:) + + term/rxvt.el:309:17:Warning: assignment to free variable + `default-frame-background-mode' ** I think `(set-)terminal-local-value' and the terminal parameter mechanism should be integrated into a single framework.
--- a/src/callproc.c Mon Dec 26 02:14:10 2005 +0000 +++ b/src/callproc.c Mon Dec 26 02:21:31 2005 +0000 @@ -1493,7 +1493,7 @@ /* Find the environment in which to search the variable. */ if (!NILP (terminal)) { - Lisp_Object local = get_terminal_param (get_device (terminal, 1)); + Lisp_Object local = get_terminal_param (get_device (terminal, 1), Qenvironment); /* Use Vprocess_environment if there is no local environment. */ if (!NILP (local)) environment = local;
--- a/src/dispextern.h Mon Dec 26 02:14:10 2005 +0000 +++ b/src/dispextern.h Mon Dec 26 02:21:31 2005 +0000 @@ -2939,8 +2939,6 @@ extern void delete_glyphs P_ ((struct frame *, int)); extern void ins_del_lines P_ ((struct frame *, int, int)); -extern struct device *get_device P_ ((Lisp_Object display, int)); - extern struct device *init_initial_device P_ ((void));
--- a/src/termhooks.h Mon Dec 26 02:14:10 2005 +0000 +++ b/src/termhooks.h Mon Dec 26 02:21:31 2005 +0000 @@ -596,7 +596,7 @@ #define DEVICE_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input) extern Lisp_Object get_terminal_param P_ ((struct device *, Lisp_Object)); - +extern struct device *get_device P_ ((Lisp_Object display, int)); extern struct device *create_device P_ ((void)); extern void delete_device P_ ((struct device *));