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/lread.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/lread.c')
| -rw-r--r-- | src/lread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c index 4ce6a442c36..4eba8635521 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -3603,7 +3603,7 @@ substitute_object_recurse (struct subst *subst, Lisp_Object subtree) | |||
| 3603 | return subtree; | 3603 | return subtree; |
| 3604 | 3604 | ||
| 3605 | /* If we've been to this node before, don't explore it again. */ | 3605 | /* If we've been to this node before, don't explore it again. */ |
| 3606 | if (!EQ (Qnil, Fmemq (subtree, subst->seen))) | 3606 | if (!NILP (Fmemq (subtree, subst->seen))) |
| 3607 | return subtree; | 3607 | return subtree; |
| 3608 | 3608 | ||
| 3609 | /* If this node can be the entry point to a cycle, remember that | 3609 | /* If this node can be the entry point to a cycle, remember that |
| @@ -4236,7 +4236,7 @@ usage: (unintern NAME OBARRAY) */) | |||
| 4236 | session if we unintern them, as well as even more ways to use | 4236 | session if we unintern them, as well as even more ways to use |
| 4237 | `setq' or `fset' or whatnot to make the Emacs session | 4237 | `setq' or `fset' or whatnot to make the Emacs session |
| 4238 | unusable. Let's not go down this silly road. --Stef */ | 4238 | unusable. Let's not go down this silly road. --Stef */ |
| 4239 | /* if (EQ (tem, Qnil) || EQ (tem, Qt)) | 4239 | /* if (NILP (tem) || EQ (tem, Qt)) |
| 4240 | error ("Attempt to unintern t or nil"); */ | 4240 | error ("Attempt to unintern t or nil"); */ |
| 4241 | 4241 | ||
| 4242 | XSYMBOL (tem)->u.s.interned = SYMBOL_UNINTERNED; | 4242 | XSYMBOL (tem)->u.s.interned = SYMBOL_UNINTERNED; |