Mercurial > emacs
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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 16 Oct 2007 16:28:39 +0000 |
parents | 75ad106491dd |
children | 9f3a25157e4f 1251cabc40b7 |
comparison
equal
deleted
inserted
replaced
85329:ad9922c079e4 | 85330:0bc184c59770 |
---|---|
8279 == noErr) | 8279 == noErr) |
8280 { | 8280 { |
8281 Lisp_Object rest = XCDR (XCDR (text_encoding_info)); | 8281 Lisp_Object rest = XCDR (XCDR (text_encoding_info)); |
8282 | 8282 |
8283 if (size > 0 || style == normal) | 8283 if (size > 0 || style == normal) |
8284 for (; !NILP (rest); rest = XCDR (rest)) | 8284 for (; CONSP (rest); rest = XCDR (rest)) |
8285 add_mac_font_name (name, size, style, SDATA (XCAR (rest))); | 8285 add_mac_font_name (name, size, style, SDATA (XCAR (rest))); |
8286 } | 8286 } |
8287 } | 8287 } |
8288 | 8288 |
8289 UNGCPRO; | 8289 UNGCPRO; |
8354 | 8354 |
8355 for (j = 0; j <= fat->numAssoc; j++, assc_entry++) | 8355 for (j = 0; j <= fat->numAssoc; j++, assc_entry++) |
8356 { | 8356 { |
8357 Lisp_Object rest = XCDR (XCDR (text_encoding_info)); | 8357 Lisp_Object rest = XCDR (XCDR (text_encoding_info)); |
8358 | 8358 |
8359 for (; !NILP (rest); rest = XCDR (rest)) | 8359 for (; CONSP (rest); rest = XCDR (rest)) |
8360 add_mac_font_name (name, assc_entry->fontSize, | 8360 add_mac_font_name (name, assc_entry->fontSize, |
8361 assc_entry->fontStyle, | 8361 assc_entry->fontStyle, |
8362 SDATA (XCAR (rest))); | 8362 SDATA (XCAR (rest))); |
8363 } | 8363 } |
8364 } | 8364 } |