comparison src/w32fns.c @ 91056:1251cabc40b7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 890-898) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 122-128) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 257-258) - Merge from emacs--rel--22 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
author Miles Bader <miles@gnu.org>
date Fri, 19 Oct 2007 00:00:21 +0000
parents a0e466c4d599 f7d19cfed7da
children 4bc33ffdda1a
comparison
equal deleted inserted replaced
91055:46bc3a01b2fa 91056:1251cabc40b7
848 { 848 {
849 Lisp_Object tail, ret = Qnil; 849 Lisp_Object tail, ret = Qnil;
850 850
851 BLOCK_INPUT; 851 BLOCK_INPUT;
852 852
853 for (tail = Vw32_color_map; !NILP (tail); tail = Fcdr (tail)) 853 for (tail = Vw32_color_map; CONSP (tail); tail = XCDR (tail))
854 { 854 {
855 register Lisp_Object elt, tem; 855 register Lisp_Object elt, tem;
856 856
857 elt = Fcar (tail); 857 elt = XCAR (tail);
858 if (!CONSP (elt)) continue; 858 if (!CONSP (elt)) continue;
859 859
860 tem = Fcar (elt); 860 tem = Fcar (elt);
861 861
862 if (lstrcmpi (SDATA (tem), colorname) == 0) 862 if (lstrcmpi (SDATA (tem), colorname) == 0)
4504 || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) 4504 || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
4505 kb->Vdefault_minibuffer_frame = frame; 4505 kb->Vdefault_minibuffer_frame = frame;
4506 4506
4507 /* All remaining specified parameters, which have not been "used" 4507 /* All remaining specified parameters, which have not been "used"
4508 by x_get_arg and friends, now go in the misc. alist of the frame. */ 4508 by x_get_arg and friends, now go in the misc. alist of the frame. */
4509 for (tem = parameters; !NILP (tem); tem = XCDR (tem)) 4509 for (tem = parameters; CONSP (tem); tem = XCDR (tem))
4510 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) 4510 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
4511 f->param_alist = Fcons (XCAR (tem), f->param_alist); 4511 f->param_alist = Fcons (XCAR (tem), f->param_alist);
4512 4512
4513 store_frame_param (f, Qwindow_system, Qw32); 4513 store_frame_param (f, Qwindow_system, Qw32);
4514 4514
6956 () 6956 ()
6957 { 6957 {
6958 Lisp_Object tail, result; 6958 Lisp_Object tail, result;
6959 6959
6960 result = Qnil; 6960 result = Qnil;
6961 for (tail = w32_display_name_list; ! NILP (tail); tail = XCDR (tail)) 6961 for (tail = w32_display_name_list; CONSP (tail); tail = XCDR (tail))
6962 result = Fcons (XCAR (XCAR (tail)), result); 6962 result = Fcons (XCAR (XCAR (tail)), result);
6963 6963
6964 return result; 6964 return result;
6965 } 6965 }
6966 6966