aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorPaul Eggert2018-07-19 22:03:34 -0700
committerPaul Eggert2018-07-19 22:05:27 -0700
commitfb24ce37d1bc258cfc3884d9828aa0602fa06e1d (patch)
tree2c0669e13f1324d78b9a0e2de496fc366016ef12 /src/menu.c
parent96d77f9eb882b68e994e187ed9c2156a23e3279d (diff)
downloademacs-fb24ce37d1bc258cfc3884d9828aa0602fa06e1d.tar.gz
emacs-fb24ce37d1bc258cfc3884d9828aa0602fa06e1d.zip
Prefer NILP (x) to EQ (x, Qnil)
This simplifies the code a bit, and also simplifies some potential future changes slightly (e.g., altering eq vs eql). * src/alloc.c (mark_object): * src/callint.c (fix_command): * src/chartab.c (Fchar_table_range, Fset_char_table_range): * src/dbusbind.c (XD_OBJECT_TO_DBUS_TYPE, xd_signature): * src/dired.c (Fsystem_users): * src/fileio.c (Fdo_auto_save): * src/fns.c (concat): * src/frame.c (get_frame_param, frame_inhibit_resize) (store_in_alist, store_frame_param, x_set_autoraise) (x_set_autolower, x_get_arg): * src/image.c (Fclear_image_cache): * src/intervals.c (intervals_equal): * src/intervals.h (DEFAULT_INTERVAL_P): * src/lread.c (substitute_object_recurse): * src/menu.c (digest_single_submenu) (find_and_call_menu_selection) (find_and_return_menu_selection): * src/nsfns.m (x_set_icon_name, Fx_create_frame): * src/nsmenu.m (ns_menu_show): * src/nsselect.m (ns_string_to_pasteboard_internal) (Fns_selection_exists_p, Fns_selection_owner_p): * src/process.c (Faccept_process_output) (wait_reading_process_output): * src/terminal.c (store_terminal_param): * src/textprop.c (verify_interval_modification): * src/xdisp.c (next_element_from_buffer): * src/xfaces.c (Finternal_set_lisp_face_attribute): * src/xfns.c (x_set_icon_type, Fx_synchronize): * src/xmenu.c (x_menu_show): * src/xselect.c (Fx_selection_owner_p) (Fx_selection_exists_p): * src/xwidget.c (xwidget_view_lookup): Prefer NILP (x) to EQ (x, Qnil).
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/menu.c b/src/menu.c
index e7d4d782fe8..a088083df27 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -647,7 +647,7 @@ digest_single_submenu (int start, int end, bool top_level_items)
647 i = start; 647 i = start;
648 while (i < end) 648 while (i < end)
649 { 649 {
650 if (EQ (AREF (menu_items, i), Qnil)) 650 if (NILP (AREF (menu_items, i)))
651 { 651 {
652 submenu_stack[submenu_depth++] = save_wv; 652 submenu_stack[submenu_depth++] = save_wv;
653 save_wv = prev_wv; 653 save_wv = prev_wv;
@@ -900,7 +900,7 @@ find_and_call_menu_selection (struct frame *f, int menu_bar_items_used,
900 900
901 while (i < menu_bar_items_used) 901 while (i < menu_bar_items_used)
902 { 902 {
903 if (EQ (AREF (vector, i), Qnil)) 903 if (NILP (AREF (vector, i)))
904 { 904 {
905 subprefix_stack[submenu_depth++] = prefix; 905 subprefix_stack[submenu_depth++] = prefix;
906 prefix = entry; 906 prefix = entry;
@@ -985,7 +985,7 @@ find_and_return_menu_selection (struct frame *f, bool keymaps, void *client_data
985 985
986 while (i < menu_items_used) 986 while (i < menu_items_used)
987 { 987 {
988 if (EQ (AREF (menu_items, i), Qnil)) 988 if (NILP (AREF (menu_items, i)))
989 { 989 {
990 subprefix_stack[submenu_depth++] = prefix; 990 subprefix_stack[submenu_depth++] = prefix;
991 prefix = entry; 991 prefix = entry;