comparison src/xfns.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 591c29778a30
children 9f3a25157e4f 1251cabc40b7
comparison
equal deleted inserted replaced
85329:ad9922c079e4 85330:0bc184c59770
3466 || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) 3466 || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
3467 kb->Vdefault_minibuffer_frame = frame; 3467 kb->Vdefault_minibuffer_frame = frame;
3468 3468
3469 /* All remaining specified parameters, which have not been "used" 3469 /* All remaining specified parameters, which have not been "used"
3470 by x_get_arg and friends, now go in the misc. alist of the frame. */ 3470 by x_get_arg and friends, now go in the misc. alist of the frame. */
3471 for (tem = parms; !NILP (tem); tem = XCDR (tem)) 3471 for (tem = parms; CONSP (tem); tem = XCDR (tem))
3472 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) 3472 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
3473 f->param_alist = Fcons (XCAR (tem), f->param_alist); 3473 f->param_alist = Fcons (XCAR (tem), f->param_alist);
3474 3474
3475 store_frame_param (f, Qwindow_system, Qx); 3475 store_frame_param (f, Qwindow_system, Qx);
3476 3476
4154 () 4154 ()
4155 { 4155 {
4156 Lisp_Object tail, result; 4156 Lisp_Object tail, result;
4157 4157
4158 result = Qnil; 4158 result = Qnil;
4159 for (tail = x_display_name_list; ! NILP (tail); tail = XCDR (tail)) 4159 for (tail = x_display_name_list; CONSP (tail); tail = XCDR (tail))
4160 result = Fcons (XCAR (XCAR (tail)), result); 4160 result = Fcons (XCAR (XCAR (tail)), result);
4161 4161
4162 return result; 4162 return result;
4163 } 4163 }
4164 4164