diff src/macterm.c @ 85330:0bc184c59770

* 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.

--- a/src/macterm.c	Tue Oct 16 15:49:43 2007 +0000
+++ b/src/macterm.c	Tue Oct 16 16:28:39 2007 +0000
@@ -8281,7 +8281,7 @@
 	  Lisp_Object rest = XCDR (XCDR (text_encoding_info));
 
 	  if (size > 0 || style == normal)
-	    for (; !NILP (rest); rest = XCDR (rest))
+	    for (; CONSP (rest); rest = XCDR (rest))
 	      add_mac_font_name (name, size, style, SDATA (XCAR (rest)));
 	}
     }
@@ -8356,7 +8356,7 @@
 		{
 		  Lisp_Object rest = XCDR (XCDR (text_encoding_info));
 
-		  for (; !NILP (rest); rest = XCDR (rest))
+		  for (; CONSP (rest); rest = XCDR (rest))
 		    add_mac_font_name (name, assc_entry->fontSize,
 				       assc_entry->fontStyle,
 				       SDATA (XCAR (rest)));