diff options
author | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
---|---|---|
committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
commit | aac2e6e4a9dd8602d5848abf70ab9f2fc4d6e8d2 (patch) | |
tree | f452d7d432f4498a7e7e3f8f5ccedb5635a548a3 /src/dispnew.c | |
parent | e4cec79ec01676bebee3aa12263f13107efb5052 (diff) | |
parent | 96a0120aeb5172c2d738bd8a6e26549b3b6cee97 (diff) | |
download | emacs-aac2e6e4a9dd8602d5848abf70ab9f2fc4d6e8d2.tar.gz |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-660
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-662
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-663
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-664
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-665
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* emacs@sv.gnu.org/emacs--devo--0--patch-667
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-668
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-670
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-671
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-672
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-673
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
Diffstat (limited to 'src/dispnew.c')
-rw-r--r-- | src/dispnew.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 4c3a4ca3f02..697773f4daf 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6381,7 +6381,11 @@ FILE = nil means just close any termscript file currently open. */) tty = CURTTY (); if (tty->termscript != 0) + { + BLOCK_INPUT; fclose (tty->termscript); + UNBLOCK_INPUT; + } tty->termscript = 0; if (! NILP (file)) @@ -6412,6 +6416,7 @@ currently selected frame. */) /* ??? Perhaps we should do something special for multibyte strings here. */ CHECK_STRING (string); + BLOCK_INPUT; if (!t) error ("Unknown terminal device"); @@ -6425,6 +6430,7 @@ currently selected frame. */) } fwrite (SDATA (string), 1, SBYTES (string), tty->output); fflush (tty->output); + UNBLOCK_INPUT; return Qnil; } |