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

85329:ad9922c079e4

	     == noErr)
	{
	  Lisp_Object rest = XCDR (XCDR (text_encoding_info));

	  if (size > 0 || style == normal)
	    for (; !NILP (rest); rest = XCDR (rest))
	      add_mac_font_name (name, size, style, SDATA (XCAR (rest)));
	}
    }

  UNGCPRO;

	      for (j = 0; j <= fat->numAssoc; j++, assc_entry++)
		{
		  Lisp_Object rest = XCDR (XCDR (text_encoding_info));

		  for (; !NILP (rest); rest = XCDR (rest))
		    add_mac_font_name (name, assc_entry->fontSize,
				       assc_entry->fontStyle,
				       SDATA (XCAR (rest)));
		}
	    }

85330:0bc184c59770

	     == noErr)
	{
	  Lisp_Object rest = XCDR (XCDR (text_encoding_info));

	  if (size > 0 || style == normal)
	    for (; CONSP (rest); rest = XCDR (rest))
	      add_mac_font_name (name, size, style, SDATA (XCAR (rest)));
	}
    }

  UNGCPRO;

	      for (j = 0; j <= fat->numAssoc; j++, assc_entry++)
		{
		  Lisp_Object rest = XCDR (XCDR (text_encoding_info));

		  for (; CONSP (rest); rest = XCDR (rest))
		    add_mac_font_name (name, assc_entry->fontSize,
				       assc_entry->fontStyle,
				       SDATA (XCAR (rest)));
		}
	    }