summaryrefslogtreecommitdiff
path: root/src/dispnew.c
diff options
context:
space:
mode:
authorKaroly Lorentey <karoly@lorentey.hu>2007-04-22 12:12:29 +0000
committerKaroly Lorentey <karoly@lorentey.hu>2007-04-22 12:12:29 +0000
commite18c709364b095ea0be8ecabe458ac9a642a252f (patch)
treeefe814a842f932f387b3947c572bf43a548d17ef /src/dispnew.c
parent81088e260b086fe28f36964f32b6338210ec6fd8 (diff)
parent9f25e707aaad5ed14a9448e9c5d345ff0bdbc5a7 (diff)
downloademacs-e18c709364b095ea0be8ecabe458ac9a642a252f.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.c6
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;
}