Mercurial > emacs
diff src/dispnew.c @ 83560:738ce3540ffb
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
author | Karoly Lorentey <karoly@lorentey.hu> |
---|---|
date | Sun, 22 Apr 2007 12:12:29 +0000 |
parents | 07774e5c3ff5 685fa6c9ae44 |
children | dc002877ce12 |
line wrap: on
line diff
--- a/src/dispnew.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/dispnew.c Sun Apr 22 12:12:29 2007 +0000 @@ -6381,7 +6381,11 @@ tty = CURTTY (); if (tty->termscript != 0) + { + BLOCK_INPUT; fclose (tty->termscript); + UNBLOCK_INPUT; + } tty->termscript = 0; if (! NILP (file)) @@ -6412,6 +6416,7 @@ /* ??? 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 @@ } fwrite (SDATA (string), 1, SBYTES (string), tty->output); fflush (tty->output); + UNBLOCK_INPUT; return Qnil; }