[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xmenu.c,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/xmenu.c,v |
Date: |
Sat, 23 Aug 2008 16:45:51 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/08/23 16:45:51
Index: xmenu.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xmenu.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -b -r1.335 -r1.336
--- xmenu.c 1 Aug 2008 15:44:26 -0000 1.335
+++ xmenu.c 23 Aug 2008 16:45:51 -0000 1.336
@@ -360,6 +360,13 @@
Lisp_Object bar_window;
enum scroll_bar_part part;
unsigned long time;
+ void (*mouse_position_hook) P_ ((struct frame **, int,
+ Lisp_Object *,
+ enum scroll_bar_part *,
+ Lisp_Object *,
+ Lisp_Object *,
+ unsigned long *)) =
+ new_f->terminal->mouse_position_hook;
if (mouse_position_hook)
(*mouse_position_hook) (&new_f, 1, &bar_window,
@@ -403,8 +410,8 @@
xpos += XINT (x);
ypos += XINT (y);
- if (! FRAME_X_P (f))
- error ("Can not put X menu on non-X terminal");
+ if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
+ error ("Can not put X menu on this terminal");
XSETFRAME (Vmenu_updating_frame, f);
}
@@ -594,8 +601,8 @@
but I don't want to make one now. */
CHECK_WINDOW (window);
- if (! FRAME_X_P (f))
- error ("Can not put X dialog on non-X terminal");
+ if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
+ error ("Can not put X dialog on this terminal");
#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
/* Display a menu with these alternatives
@@ -2605,7 +2612,7 @@
unsigned int dummy_uint;
int specpdl_count = SPECPDL_INDEX ();
- if (! FRAME_X_P (f))
+ if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
abort ();
*error = 0;