diff options
| author | Stefan Monnier | 2008-09-30 22:06:15 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-09-30 22:06:15 +0000 |
| commit | cecfdea64b53ed96864088dd1b535271beb6d21b (patch) | |
| tree | 3e22cc92b2d3eb69833ce22532b4a6371c8344ae /src | |
| parent | ffaa90dd9847e4bd6abc10f30efa1197a05001d9 (diff) | |
| download | emacs-cecfdea64b53ed96864088dd1b535271beb6d21b.tar.gz emacs-cecfdea64b53ed96864088dd1b535271beb6d21b.zip | |
(Fsend_string_to_terminal): Don't try to send a string to a suspended terminal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/dispnew.c | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8007e948323..5d3972ca185 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-09-30 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * dispnew.c (Fsend_string_to_terminal): Don't try to send a string to | ||
| 4 | a suspended terminal. | ||
| 5 | |||
| 1 | 2008-09-30 Michael Albinus <michael.albinus@gmx.de> | 6 | 2008-09-30 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * dbusbind.c (xd_signature): Use strcat instead of sprintf. | 8 | * dbusbind.c (xd_signature): Use strcat instead of sprintf. |
| @@ -30,13 +35,11 @@ | |||
| 30 | 35 | ||
| 31 | 2008-09-28 Dan Nicolaescu <dann@ics.uci.edu> | 36 | 2008-09-28 Dan Nicolaescu <dann@ics.uci.edu> |
| 32 | 37 | ||
| 33 | * dispnew.c (init_display): Return earlier when running as a | 38 | * dispnew.c (init_display): Return earlier when running as a daemon. |
| 34 | daemon. | ||
| 35 | 39 | ||
| 36 | 2008-09-27 Adrian Robert <Adrian.B.Robert@gmail.com> | 40 | 2008-09-27 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 37 | 41 | ||
| 38 | * nsfont.m (nsfont_draw): Fix up composition rendering (cmp_from, | 42 | * nsfont.m (nsfont_draw): Fix up composition rendering (cmp_from, ...). |
| 39 | etc.). | ||
| 40 | 43 | ||
| 41 | 2008-09-27 Eli Zaretskii <eliz@gnu.org> | 44 | 2008-09-27 Eli Zaretskii <eliz@gnu.org> |
| 42 | 45 | ||
diff --git a/src/dispnew.c b/src/dispnew.c index 307515f7bfb..33bbdca6700 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -6465,6 +6465,9 @@ currently selected frame. */) | |||
| 6465 | 6465 | ||
| 6466 | tty = t->display_info.tty; | 6466 | tty = t->display_info.tty; |
| 6467 | 6467 | ||
| 6468 | if (! tty->output) | ||
| 6469 | error ("Terminal is currently suspended"); | ||
| 6470 | |||
| 6468 | if (tty->termscript) | 6471 | if (tty->termscript) |
| 6469 | { | 6472 | { |
| 6470 | fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); | 6473 | fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); |