aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKaroly Lorentey2005-12-22 21:02:45 +0000
committerKaroly Lorentey2005-12-22 21:02:45 +0000
commitf35ca2fe35859b40b1b0ff15a1751aab4805d392 (patch)
treecd20a5dee4af655f0a1cb31175fee4c28aff7b3f /src
parenta18b8cb5070a81da0659275bef52f77f925644c8 (diff)
downloademacs-f35ca2fe35859b40b1b0ff15a1751aab4805d392.tar.gz
emacs-f35ca2fe35859b40b1b0ff15a1751aab4805d392.zip
Reimplement and extend support for terminal-local environment variables.
* lisp/termdev.el: New file. Move terminal parameter-related functions here from frame.el. (terminal-getenv, with-terminal-environment): Reimplement and extend. (terminal-setenv, terminal-setenv-internal): New functions. * lisp/frame.el (make-frame-on-tty, framep-on-display, suspend-frame): Extend doc string, update parameter names. (terminal-id, terminal-parameter-alist, terminal-parameters) (terminal-parameter-p, terminal-parameter, set-terminal-parameter) (terminal-handle-delete-frame, terminal-getenv, terminal-getenv) (with-terminal-environment): Move to termdev.el. * lisp/loadup.el: Load termdev as well. * lisp/Makefile.in (lisp, shortlisp): Add termdev.elc. * lisp/makefile.MPW (shortlisp): Ditto. * lisp/ebuff-menu.el (electric-buffer-menu-mode-map): Bind C-z to `suspend-frame', not `suspend-emacs'. * lisp/echistory.el (electric-history-map): Ditto. * lisp/ebrowse.el (ebrowse-electric-list-mode-map): Ditto. * lisp/ebrowse.el (ebrowse-electric-position-mode-map): Ditto. * lisp/startup.el (normal-splash-screen): Use `save-buffers-kill-display' instead of `save-buffers-kill-emacs'. * lisp/x-win.el (x-initialize-window-system): Add 'global-ok option to `terminal-getenv'. * src/term.c (suspend-tty): Update doc string. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-456
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in2
-rw-r--r--src/print.c2
-rw-r--r--src/term.c22
3 files changed, 14 insertions, 12 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 2799b3ff46b..e0ba8a25b66 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -722,6 +722,7 @@ lisp= \
722 MOUSE_SUPPORT \ 722 MOUSE_SUPPORT \
723 ${lispsource}emacs-lisp/float-sup.elc \ 723 ${lispsource}emacs-lisp/float-sup.elc \
724 ${lispsource}frame.elc \ 724 ${lispsource}frame.elc \
725 ${lispsource}termdev.elc \
725 ${lispsource}help.elc \ 726 ${lispsource}help.elc \
726 ${lispsource}indent.elc \ 727 ${lispsource}indent.elc \
727 ${lispsource}isearch.elc \ 728 ${lispsource}isearch.elc \
@@ -819,6 +820,7 @@ shortlisp= \
819 ../lisp/emacs-lisp/float-sup.elc \ 820 ../lisp/emacs-lisp/float-sup.elc \
820 ../lisp/format.elc \ 821 ../lisp/format.elc \
821 ../lisp/frame.elc \ 822 ../lisp/frame.elc \
823 ../lisp/termdev.elc \
822 ../lisp/help.elc \ 824 ../lisp/help.elc \
823 ../lisp/indent.elc \ 825 ../lisp/indent.elc \
824 ../lisp/isearch.elc \ 826 ../lisp/isearch.elc \
diff --git a/src/print.c b/src/print.c
index 20c359f9b69..3a1fe336b56 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1343,7 +1343,7 @@ print_preprocess (obj)
1343 for (i = 0; i < print_number_index; i++) 1343 for (i = 0; i < print_number_index; i++)
1344 if (EQ (PRINT_NUMBER_OBJECT (Vprint_number_table, i), obj)) 1344 if (EQ (PRINT_NUMBER_OBJECT (Vprint_number_table, i), obj))
1345 { 1345 {
1346 /* OBJ appears more than once. Let's remember that. */ 1346 /* OBJ appears more than once. Let's remember that. */
1347 PRINT_NUMBER_STATUS (Vprint_number_table, i) = Qt; 1347 PRINT_NUMBER_STATUS (Vprint_number_table, i) = Qt;
1348 return; 1348 return;
1349 } 1349 }
diff --git a/src/term.c b/src/term.c
index 234be4a9271..679def93c72 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3270,23 +3270,23 @@ Display devices are represented by their integer identifiers. */)
3270 3270
3271DEFUN ("suspend-tty", Fsuspend_tty, Ssuspend_tty, 0, 1, 0, 3271DEFUN ("suspend-tty", Fsuspend_tty, Ssuspend_tty, 0, 1, 0,
3272 doc: /* Suspend the terminal device TTY. 3272 doc: /* Suspend the terminal device TTY.
3273The terminal is restored to its default state, and Emacs ceases all
3274access to the terminal device. Frames that use the device are not
3275deleted, but input is not read from them and if they change, their
3276display is not updated.
3277 3273
3278TTY may be a display id, a frame, or nil for the display device of the 3274The device is restored to its default state, and Emacs ceases all
3279currently selected frame. 3275access to the tty device. Frames that use the device are not deleted,
3276but input is not read from them and if they change, their display is
3277not updated.
3278
3279TTY may be a terminal id, a frame, or nil for the terminal device of
3280the currently selected frame.
3280 3281
3281This function runs `suspend-tty-functions' after suspending the 3282This function runs `suspend-tty-functions' after suspending the
3282device. The functions are run with one arg, the id of the suspended 3283device. The functions are run with one arg, the id of the suspended
3283display device. 3284terminal device.
3284 3285
3285`suspend-tty' does nothing if it is called on an already suspended 3286`suspend-tty' does nothing if it is called on a device that is already
3286device. 3287suspended.
3287 3288
3288A suspended terminal device may be resumed by calling `resume-tty' on 3289A suspended tty may be resumed by calling `resume-tty' on it. */)
3289it. */)
3290 (tty) 3290 (tty)
3291 Lisp_Object tty; 3291 Lisp_Object tty;
3292{ 3292{