Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7cef7ce3
Commit
7cef7ce3
authored
Sep 03, 2009
by
Stefan Monnier
Browse files
(Fsend_string_to_terminal): Make it work again on the initial terminal as well.
parent
a54fa5b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
12 deletions
+25
-12
src/ChangeLog
src/ChangeLog
+6
-1
src/dispnew.c
src/dispnew.c
+19
-11
No files found.
src/ChangeLog
View file @
7cef7ce3
2009-09-03 Stefan Monnier <monnier@iro.umontreal.ca>
* dispnew.c (Fsend_string_to_terminal): Make it work again on the
initial terminal as well.
2009-09-02 Jan Djärv <jan.h.d@swipnet.se>
* xterm.h: Rename x_non_menubar_window_to_frame to
x_menubar_window_to_frame
x_menubar_window_to_frame
.
* xterm.c: Remove declarations also in xterm.h
(XTmouse_position): Do not return valid positions
...
...
src/dispnew.c
View file @
7cef7ce3
...
...
@@ -6475,8 +6475,8 @@ currently selected frame. */)
Lisp_Object string;
Lisp_Object terminal;
{
struct terminal *t = get_
tty_
terminal (terminal, 1);
struct tty_display_info *tty
;
struct terminal *t = get_terminal (terminal, 1);
FILE *out
;
/* ??? Perhaps we should do something special for multibyte strings here. */
CHECK_STRING (string);
...
...
@@ -6485,18 +6485,26 @@ currently selected frame. */)
if (!t)
error ("Unknown terminal device");
tty = t->display_info.tty;
if (t->type == output_initial)
out = stdout;
else if (t->type != output_termcap && t->type != output_msdos_raw)
error ("Device %d is not a termcap terminal device", t->id);
else
{
struct tty_display_info *tty = t->display_info.tty;
if (! tty->output)
error ("Terminal is currently suspended");
if (! tty->output)
error ("Terminal is currently suspended");
if (tty->termscript)
{
fwrite (SDATA (string), 1, SBYTES (string), tty->termscript);
fflush (tty->termscript);
if (tty->termscript)
{
fwrite (SDATA (string), 1, SBYTES (string), tty->termscript);
fflush (tty->termscript);
}
out = tty->output;
}
fwrite (SDATA (string), 1, SBYTES (string),
tty->outp
ut);
fflush (
tty->outp
ut);
fwrite (SDATA (string), 1, SBYTES (string),
o
ut);
fflush (
o
ut);
UNBLOCK_INPUT;
return Qnil;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment