diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-10-11 09:23:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-10-11 09:23:37 -0700 |
| commit | 7cded46f2bef23f86041cc883618ac82b6dbfe61 (patch) | |
| tree | c85855d128fee9247561a6f1395bfec9d8ceaa58 /src/nsmenu.m | |
| parent | 549c3414d97575bfe537d2a4d357d48ea58c980a (diff) | |
| download | emacs-7cded46f2bef23f86041cc883618ac82b6dbfe61.tar.gz | |
lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans.
* lread.c (load_each_byte, new_backquote_flag, readchar)
(read_filtered_event, lisp_file_lexically_bound_p)
(safe_to_load_version, Fload, complete_filename_p, openp)
(build_load_history, readevalloop, read_escape, read1)
(string_to_number, read_vector, read_list):
* macros.c (Fstart_kbd_macro):
* marker.c (CONSIDER):
* menu.c (parse_single_submenu, digest_single_submenu)
(find_and_return_menu_selection, Fx_popup_menu):
* minibuf.c (read_minibuf_noninteractive, read_minibuf)
(Ftry_completion):
* nsmenu.m (ns_update_menubar, runMenuAt:forFrame:keymaps:):
(ns_menu_show):
* xmenu.c (set_frame_menubar, create_and_show_popup_menu)
(xmenu_show, xdialog_show):
Use bool for booleans.
* lread.c (safe_to_load_version): Rename from safe_to_load_p,
as it's not a predicate. All uses changed. Omit unnecessary
buffer termination.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index a5983c70cdb..d0ea8f5a47a 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -181,7 +181,8 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) /* Fully parse one or more of the submenus. */ int n = 0; int *submenu_start, *submenu_end; - int *submenu_top_level_items, *submenu_n_panes; + bool *submenu_top_level_items; + int *submenu_n_panes; struct buffer *prev = current_buffer; Lisp_Object buffer; ptrdiff_t specpdl_count = SPECPDL_INDEX (); @@ -740,7 +741,7 @@ extern NSString *NSMenuDidBeginTrackingNotification; /* run a menu in popup mode */ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f - keymaps: (int)keymaps + keymaps: (bool)keymaps { EmacsView *view = FRAME_NS_VIEW (f); NSEvent *e, *event; @@ -779,7 +780,7 @@ extern NSString *NSMenuDidBeginTrackingNotification; ========================================================================== */ Lisp_Object -ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, +ns_menu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps, Lisp_Object title, const char **error) { EmacsMenu *pmenu; @@ -801,7 +802,7 @@ ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, #if 0 /* FIXME: a couple of one-line differences prevent reuse */ - wv = digest_single_submenu (0, menu_items_used, Qnil); + wv = digest_single_submenu (0, menu_items_used, 0); #else { widget_value *save_wv = 0, *prev_wv = 0; |