* xselect.c (x_own_selection, x_handle_selection_clear)

(x_clear_frame_selections):
* w32menu.c (list_of_panes, list_of_items):
* w32fns.c (w32_color_map_lookup, Fx_create_frame, Fx_display_list):
* textprop.c (validate_plist, interval_has_all_properties)
(interval_has_some_properties, interval_has_some_properties_list)
(add_properties, text_property_list):
* process.c (Fget_buffer_process, list_processes_1, status_notify):
* minibuf.c (Fassoc_string):
* macselect.c (x_own_selection, x_clear_frame_selections)
(Fx_disown_selection_internal):
* keymap.c (Fcommand_remapping, where_is_internal, describe_map_tree):
Use CONSP rather than !NILP and XC[AD]R rather than Fc[ad]r.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 8af99a2d0b..41a1994f3f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -845,11 +845,11 @@ w32_color_map_lookup (colorname)
 
   BLOCK_INPUT;
 
-  for (tail = Vw32_color_map; !NILP (tail); tail = Fcdr (tail))
+  for (tail = Vw32_color_map; CONSP (tail); tail = XCDR (tail))
     {
       register Lisp_Object elt, tem;
 
-      elt = Fcar (tail);
+      elt = XCAR (tail);
       if (!CONSP (elt)) continue;
 
       tem = Fcar (elt);
@@ -4450,7 +4450,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
 
   /* All remaining specified parameters, which have not been "used"
      by x_get_arg and friends, now go in the misc. alist of the frame.  */
-  for (tem = parameters; !NILP (tem); tem = XCDR (tem))
+  for (tem = parameters; CONSP (tem); tem = XCDR (tem))
     if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
       f->param_alist = Fcons (XCAR (tem), f->param_alist);
 
@@ -6838,7 +6838,7 @@ DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0,
   Lisp_Object tail, result;
 
   result = Qnil;
-  for (tail = w32_display_name_list; ! NILP (tail); tail = XCDR (tail))
+  for (tail = w32_display_name_list; CONSP (tail); tail = XCDR (tail))
     result = Fcons (XCAR (XCAR (tail)), result);
 
   return result;