* xfns.c (Fx_create_frame, Fx_display_list):

* window.c (window_fixed_size_p, enlarge_window, shrink_window_lowest_first):
* macterm.c (init_font_name_table):
* macfns.c (Fx_create_frame, Fx_display_list):
* lread.c (close_load_descs):
* keyboard.c (read_char_x_menu_prompt):
* fns.c (Fmember, Fmemql, Fdelete, Fset_char_table_parent):
* coding.c (code_convert_region_unwind): Test the type of an object
rather than just !NILP before extracting data from it.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index bd8263f9b04..fccf5c88eaa 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8538,7 +8538,7 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
              to indicate that they came from a mouse menu,
              so that when present in last_nonmenu_event
              they won't confuse things.  */
-          for (tem = XCDR (value); !NILP (tem); tem = XCDR (tem))
+          for (tem = XCDR (value); CONSP (tem); tem = XCDR (tem))
             {
               record_menu_key (XCAR (tem));
               if (SYMBOLP (XCAR (tem))