diff options
| author | Paul Eggert | 2018-07-19 22:03:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-07-19 22:05:27 -0700 |
| commit | fb24ce37d1bc258cfc3884d9828aa0602fa06e1d (patch) | |
| tree | 2c0669e13f1324d78b9a0e2de496fc366016ef12 /src/nsfns.m | |
| parent | 96d77f9eb882b68e994e187ed9c2156a23e3279d (diff) | |
| download | emacs-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/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 9ff7e88a8d4..184657f3b4f 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -363,7 +363,7 @@ x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) | |||
| 363 | if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) | 363 | if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) |
| 364 | return; | 364 | return; |
| 365 | } | 365 | } |
| 366 | else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) | 366 | else if (!STRINGP (oldval) && NILP (oldval) == NILP (arg)) |
| 367 | return; | 367 | return; |
| 368 | 368 | ||
| 369 | fset_icon_name (f, arg); | 369 | fset_icon_name (f, arg); |
| @@ -1291,7 +1291,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, | |||
| 1291 | window_prompting = x_figure_window_size (f, parms, true, &x_width, &x_height); | 1291 | window_prompting = x_figure_window_size (f, parms, true, &x_width, &x_height); |
| 1292 | 1292 | ||
| 1293 | tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); | 1293 | tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); |
| 1294 | f->no_split = minibuffer_only || (!EQ (tem, Qunbound) && !EQ (tem, Qnil)); | 1294 | f->no_split = minibuffer_only || (!EQ (tem, Qunbound) && !NILP (tem)); |
| 1295 | 1295 | ||
| 1296 | /* NOTE: on other terms, this is done in set_mouse_color, however this | 1296 | /* NOTE: on other terms, this is done in set_mouse_color, however this |
| 1297 | was not getting called under Nextstep. */ | 1297 | was not getting called under Nextstep. */ |