Mercurial > emacs
diff src/term.c @ 83370:5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
* src/dispextern.h (get_tty_device): Declare.
* src/dispnew.c (Fsend_string_to_terminal): Add optional TERMINAL parameter.
* src/fns.c (Fy_or_n_p, Fyes_or_no_p): Don't try to open an X dialog on
tty terminals.
* src/term.c (get_tty_device): Remove static qualifier.
* src/xmenu.c (create_and_show_dialog, create_and_show_popup_menu)
(free_frame_menubar, mouse_position_for_popup, set_frame_menubar)
(update_frame_menubar, x_activate_menubar, xdialog_show, xmenu_show):
Abort when given a non-X frame.
* src/xmenu.c (Fx_popup_menu, Fx_popup_dialog): Throw an error when run
on a non-X frame.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-410
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 11 Sep 2005 03:15:42 +0000 |
| parents | 532e0a9335a9 |
| children | 7a3090aca393 |
line wrap: on
line diff
--- a/src/term.c Sun Sep 11 03:06:33 2005 +0000 +++ b/src/term.c Sun Sep 11 03:15:42 2005 +0000 @@ -85,8 +85,6 @@ static void tty_show_cursor P_ ((struct tty_display_info *)); static void tty_hide_cursor P_ ((struct tty_display_info *)); -static struct device *get_tty_device (Lisp_Object device); - void delete_initial_device P_ ((struct device *)); void create_tty_output P_ ((struct frame *)); void delete_tty_output P_ ((struct frame *)); @@ -2164,11 +2162,11 @@ /* Return the tty display object specified by DEVICE. */ -static struct device * -get_tty_device (Lisp_Object device) +struct device * +get_tty_device (Lisp_Object terminal) { - struct device *d = get_device (device, 0); - + struct device *d = get_device (terminal, 0); + if (d && d->type == output_initial) d = NULL;