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/xselect.c | |
| 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/xselect.c')
| -rw-r--r-- | src/xselect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xselect.c b/src/xselect.c index 1f51be4c522..8448944c00f 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -2094,7 +2094,7 @@ On Nextstep, TERMINAL is unused. */) | |||
| 2094 | struct frame *f = frame_for_x_selection (terminal); | 2094 | struct frame *f = frame_for_x_selection (terminal); |
| 2095 | 2095 | ||
| 2096 | CHECK_SYMBOL (selection); | 2096 | CHECK_SYMBOL (selection); |
| 2097 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 2097 | if (NILP (selection)) selection = QPRIMARY; |
| 2098 | if (EQ (selection, Qt)) selection = QSECONDARY; | 2098 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 2099 | 2099 | ||
| 2100 | if (f && !NILP (LOCAL_SELECTION (selection, FRAME_DISPLAY_INFO (f)))) | 2100 | if (f && !NILP (LOCAL_SELECTION (selection, FRAME_DISPLAY_INFO (f)))) |
| @@ -2124,7 +2124,7 @@ On Nextstep, TERMINAL is unused. */) | |||
| 2124 | struct x_display_info *dpyinfo; | 2124 | struct x_display_info *dpyinfo; |
| 2125 | 2125 | ||
| 2126 | CHECK_SYMBOL (selection); | 2126 | CHECK_SYMBOL (selection); |
| 2127 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 2127 | if (NILP (selection)) selection = QPRIMARY; |
| 2128 | if (EQ (selection, Qt)) selection = QSECONDARY; | 2128 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 2129 | 2129 | ||
| 2130 | if (!f) | 2130 | if (!f) |