Mercurial > emacs
comparison src/macfns.c @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | 1251cabc40b7 9f3a25157e4f |
children | 880960b70474 |
comparison
equal
deleted
inserted
replaced
91072:74ab3ea909f9 | 91073:4bc33ffdda1a |
---|---|
2828 by x_get_arg and friends, now go in the misc. alist of the frame. */ | 2828 by x_get_arg and friends, now go in the misc. alist of the frame. */ |
2829 for (tem = parameters; CONSP (tem); tem = XCDR (tem)) | 2829 for (tem = parameters; CONSP (tem); tem = XCDR (tem)) |
2830 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) | 2830 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) |
2831 f->param_alist = Fcons (XCAR (tem), f->param_alist); | 2831 f->param_alist = Fcons (XCAR (tem), f->param_alist); |
2832 | 2832 |
2833 store_frame_param (f, Qwindow_system, Qmac); | |
2834 | |
2835 UNGCPRO; | 2833 UNGCPRO; |
2836 | 2834 |
2837 /* Make sure windows on this frame appear in calls to next-window | 2835 /* Make sure windows on this frame appear in calls to next-window |
2838 and similar functions. */ | 2836 and similar functions. */ |
2839 Vwindow_list = Qnil; | 2837 Vwindow_list = Qnil; |