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

1 files changed, 4 insertions, 6 deletions

diff --git a/src/term.c b/src/term.c
index 77720779baf..3b3f0ad2132 100644
--- a/src/term.c
+++ b/src/term.c
@@ -85,8 +85,6 @@ static void turn_off_face P_ ((struct frame *, int face_id));
 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 @@ get_device (Lisp_Object device, int throw)
 
 /* 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;