HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-commit of loaddefs files.
[bpt/emacs.git]
/
src
/
xmenu.c
diff --git
a/src/xmenu.c
b/src/xmenu.c
index
23f96dc
..
d03a4bc
100644
(file)
--- a/
src/xmenu.c
+++ b/
src/xmenu.c
@@
-32,13
+32,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
-#if 0 /* Why was this included? And without syssignal.h? */
-/* On 4.3 this loses if it comes after xterm.h. */
-#include <signal.h>
-#endif
-
#include <stdio.h>
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "keyboard.h"
#include "lisp.h"
#include "keyboard.h"
@@
-169,7
+163,7
@@
mouse_position_for_popup (FRAME_PTR f, int *x, int *y)
int dummy;
if (! FRAME_X_P (f))
int dummy;
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
BLOCK_INPUT;
BLOCK_INPUT;
@@
-636,7
+630,7
@@
void
x_activate_menubar (FRAME_PTR f)
{
if (! FRAME_X_P (f))
x_activate_menubar (FRAME_PTR f)
{
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
if (!f->output_data.x->saved_menu_event->type)
return;
if (!f->output_data.x->saved_menu_event->type)
return;
@@
-835,7
+829,7
@@
menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
if (!f)
return;
find_and_call_menu_selection (f, f->menu_bar_items_used,
if (!f)
return;
find_and_call_menu_selection (f, f->menu_bar_items_used,
-
FGET (f, menu_bar_vector)
, client_data);
+
f->menu_bar_vector
, client_data);
}
#endif /* not USE_GTK */
\f
}
#endif /* not USE_GTK */
\f
@@
-852,7
+846,7
@@
update_frame_menubar (FRAME_PTR f)
int columns, rows;
if (! FRAME_X_P (f))
int columns, rows;
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
x = f->output_data.x;
x = f->output_data.x;
@@
-940,7
+934,7
@@
set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
int *submenu_top_level_items, *submenu_n_panes;
if (! FRAME_X_P (f))
int *submenu_top_level_items, *submenu_n_panes;
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
menubar_widget = f->output_data.x->menubar_widget;
menubar_widget = f->output_data.x->menubar_widget;
@@
-985,7
+979,7
@@
set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
if (! menubar_widget)
previous_menu_items_used = 0;
if (! menubar_widget)
previous_menu_items_used = 0;
- buffer =
WGET (XWINDOW (FRAME_SELECTED_WINDOW (f)), buffer)
;
+ buffer =
XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer
;
specbind (Qinhibit_quit, Qt);
/* Don't let the debugger step into this code
because it is not reentrant. */
specbind (Qinhibit_quit, Qt);
/* Don't let the debugger step into this code
because it is not reentrant. */
@@
-1008,20
+1002,20
@@
set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
if (! NILP (Vlucid_menu_bar_dirty_flag))
call0 (Qrecompute_lucid_menubar);
safe_run_hooks (Qmenu_bar_update_hook);
if (! NILP (Vlucid_menu_bar_dirty_flag))
call0 (Qrecompute_lucid_menubar);
safe_run_hooks (Qmenu_bar_update_hook);
-
FSET (f, menu_bar_items
, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
+
fset_menu_bar_items (f
, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
items = FRAME_MENU_BAR_ITEMS (f);
/* Save the frame's previous menu bar contents data. */
if (previous_menu_items_used)
items = FRAME_MENU_BAR_ITEMS (f);
/* Save the frame's previous menu bar contents data. */
if (previous_menu_items_used)
- memcpy (previous_items, XVECTOR (
FGET (f, menu_bar_vector)
)->contents,
+ memcpy (previous_items, XVECTOR (
f->menu_bar_vector
)->contents,
previous_menu_items_used * word_size);
/* Fill in menu_items with the current menu bar contents.
This can evaluate Lisp code. */
save_menu_items ();
previous_menu_items_used * word_size);
/* Fill in menu_items with the current menu bar contents.
This can evaluate Lisp code. */
save_menu_items ();
- menu_items =
FGET (f, menu_bar_vector)
;
+ menu_items =
f->menu_bar_vector
;
menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
subitems = ASIZE (items) / 4;
submenu_start = alloca ((subitems + 1) * sizeof *submenu_start);
menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
subitems = ASIZE (items) / 4;
submenu_start = alloca ((subitems + 1) * sizeof *submenu_start);
@@
-1100,7
+1094,7
@@
set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
}
/* The menu items are different, so store them in the frame. */
}
/* The menu items are different, so store them in the frame. */
-
FSET (f, menu_bar_vector
, menu_items);
+
fset_menu_bar_vector (f
, menu_items);
f->menu_bar_items_used = menu_items_used;
/* This undoes save_menu_items. */
f->menu_bar_items_used = menu_items_used;
/* This undoes save_menu_items. */
@@
-1283,7
+1277,7
@@
initialize_frame_menubar (FRAME_PTR f)
{
/* This function is called before the first chance to redisplay
the frame. It has to be, so the frame will have the right size. */
{
/* This function is called before the first chance to redisplay
the frame. It has to be, so the frame will have the right size. */
-
FSET (f, menu_bar_items
, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
+
fset_menu_bar_items (f
, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
set_frame_menubar (f, 1, 1);
}
set_frame_menubar (f, 1, 1);
}
@@
-1299,7
+1293,7
@@
free_frame_menubar (FRAME_PTR f)
Widget menubar_widget;
if (! FRAME_X_P (f))
Widget menubar_widget;
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
menubar_widget = f->output_data.x->menubar_widget;
menubar_widget = f->output_data.x->menubar_widget;
@@
-1450,7
+1444,7
@@
create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y,
#endif
if (! FRAME_X_P (f))
#endif
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
xg_crazy_callback_abort = 1;
menu = xg_create_widget ("popup", first_wv->name, f, first_wv,
xg_crazy_callback_abort = 1;
menu = xg_create_widget ("popup", first_wv->name, f, first_wv,
@@
-1557,7
+1551,7
@@
create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
Widget menu;
if (! FRAME_X_P (f))
Widget menu;
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
#ifdef USE_LUCID
apply_systemfont_to_menu (f, f->output_data.x->widget);
#ifdef USE_LUCID
apply_systemfont_to_menu (f, f->output_data.x->widget);
@@
-1646,7
+1640,7
@@
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
if (! FRAME_X_P (f))
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
*error_name = NULL;
*error_name = NULL;
@@
-1792,7
+1786,7
@@
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
else if (EQ (type, QCradio))
wv->button_type = BUTTON_TYPE_RADIO;
else
else if (EQ (type, QCradio))
wv->button_type = BUTTON_TYPE_RADIO;
else
- abort ();
+
emacs_
abort ();
wv->selected = !NILP (selected);
wv->selected = !NILP (selected);
@@
-1930,7
+1924,7
@@
create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
GtkWidget *menu;
if (! FRAME_X_P (f))
GtkWidget *menu;
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
menu = xg_create_widget ("dialog", first_wv->name, f, first_wv,
G_CALLBACK (dialog_selection_callback),
menu = xg_create_widget ("dialog", first_wv->name, f, first_wv,
G_CALLBACK (dialog_selection_callback),
@@
-1977,7
+1971,7
@@
create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
LWLIB_ID dialog_id;
if (!FRAME_X_P (f))
LWLIB_ID dialog_id;
if (!FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
dialog_id = widget_id_tick++;
#ifdef USE_LUCID
dialog_id = widget_id_tick++;
#ifdef USE_LUCID
@@
-2036,7
+2030,7
@@
xdialog_show (FRAME_PTR f,
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
if (! FRAME_X_P (f))
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
if (! FRAME_X_P (f))
- abort ();
+
emacs_
abort ();
*error_name = NULL;
*error_name = NULL;
@@
-2301,7
+2295,7
@@
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
- abort ();
+
emacs_
abort ();
*error_name = 0;
if (menu_items_n_panes == 0)
*error_name = 0;
if (menu_items_n_panes == 0)