diff options
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index cf58e85af10..f7497955e93 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -315,7 +315,7 @@ for instance using the window manager, then this produces a quit and | |||
| 315 | Lisp_Object title; | 315 | Lisp_Object title; |
| 316 | const char *error_name; | 316 | const char *error_name; |
| 317 | Lisp_Object selection; | 317 | Lisp_Object selection; |
| 318 | int specpdl_count = SPECPDL_INDEX (); | 318 | ptrdiff_t specpdl_count = SPECPDL_INDEX (); |
| 319 | 319 | ||
| 320 | /* Decode the dialog items from what was specified. */ | 320 | /* Decode the dialog items from what was specified. */ |
| 321 | title = Fcar (contents); | 321 | title = Fcar (contents); |
| @@ -968,7 +968,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | |||
| 968 | 968 | ||
| 969 | struct buffer *prev = current_buffer; | 969 | struct buffer *prev = current_buffer; |
| 970 | Lisp_Object buffer; | 970 | Lisp_Object buffer; |
| 971 | int specpdl_count = SPECPDL_INDEX (); | 971 | ptrdiff_t specpdl_count = SPECPDL_INDEX (); |
| 972 | int previous_menu_items_used = f->menu_bar_items_used; | 972 | int previous_menu_items_used = f->menu_bar_items_used; |
| 973 | Lisp_Object *previous_items | 973 | Lisp_Object *previous_items |
| 974 | = (Lisp_Object *) alloca (previous_menu_items_used | 974 | = (Lisp_Object *) alloca (previous_menu_items_used |
| @@ -1434,7 +1434,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, | |||
| 1434 | GtkWidget *menu; | 1434 | GtkWidget *menu; |
| 1435 | GtkMenuPositionFunc pos_func = 0; /* Pop up at pointer. */ | 1435 | GtkMenuPositionFunc pos_func = 0; /* Pop up at pointer. */ |
| 1436 | struct next_popup_x_y popup_x_y; | 1436 | struct next_popup_x_y popup_x_y; |
| 1437 | int specpdl_count = SPECPDL_INDEX (); | 1437 | ptrdiff_t specpdl_count = SPECPDL_INDEX (); |
| 1438 | 1438 | ||
| 1439 | if (! FRAME_X_P (f)) | 1439 | if (! FRAME_X_P (f)) |
| 1440 | abort (); | 1440 | abort (); |
| @@ -1590,7 +1590,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, | |||
| 1590 | 1590 | ||
| 1591 | { | 1591 | { |
| 1592 | int fact = 4 * sizeof (LWLIB_ID); | 1592 | int fact = 4 * sizeof (LWLIB_ID); |
| 1593 | int specpdl_count = SPECPDL_INDEX (); | 1593 | ptrdiff_t specpdl_count = SPECPDL_INDEX (); |
| 1594 | record_unwind_protect (pop_down_menu, | 1594 | record_unwind_protect (pop_down_menu, |
| 1595 | Fcons (make_number (menu_id >> (fact)), | 1595 | Fcons (make_number (menu_id >> (fact)), |
| 1596 | make_number (menu_id & ~(-1 << (fact))))); | 1596 | make_number (menu_id & ~(-1 << (fact))))); |
| @@ -1909,7 +1909,7 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) | |||
| 1909 | 1909 | ||
| 1910 | if (menu) | 1910 | if (menu) |
| 1911 | { | 1911 | { |
| 1912 | int specpdl_count = SPECPDL_INDEX (); | 1912 | ptrdiff_t specpdl_count = SPECPDL_INDEX (); |
| 1913 | record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); | 1913 | record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); |
| 1914 | 1914 | ||
| 1915 | /* Display the menu. */ | 1915 | /* Display the menu. */ |
| @@ -1965,7 +1965,7 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) | |||
| 1965 | /* Process events that apply to the dialog box. | 1965 | /* Process events that apply to the dialog box. |
| 1966 | Also handle timers. */ | 1966 | Also handle timers. */ |
| 1967 | { | 1967 | { |
| 1968 | int count = SPECPDL_INDEX (); | 1968 | ptrdiff_t count = SPECPDL_INDEX (); |
| 1969 | int fact = 4 * sizeof (LWLIB_ID); | 1969 | int fact = 4 * sizeof (LWLIB_ID); |
| 1970 | 1970 | ||
| 1971 | /* xdialog_show_unwind is responsible for popping the dialog box down. */ | 1971 | /* xdialog_show_unwind is responsible for popping the dialog box down. */ |
| @@ -2262,7 +2262,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, | |||
| 2262 | int maxwidth; | 2262 | int maxwidth; |
| 2263 | int dummy_int; | 2263 | int dummy_int; |
| 2264 | unsigned int dummy_uint; | 2264 | unsigned int dummy_uint; |
| 2265 | int specpdl_count = SPECPDL_INDEX (); | 2265 | ptrdiff_t specpdl_count = SPECPDL_INDEX (); |
| 2266 | 2266 | ||
| 2267 | if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) | 2267 | if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) |
| 2268 | abort (); | 2268 | abort (); |