Mercurial > emacs
comparison src/w32fns.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 |
---|---|
25 | 25 |
26 #include <signal.h> | 26 #include <signal.h> |
27 #include <stdio.h> | 27 #include <stdio.h> |
28 #include <limits.h> | 28 #include <limits.h> |
29 #include <errno.h> | 29 #include <errno.h> |
30 #include <math.h> | |
30 | 31 |
31 #include "lisp.h" | 32 #include "lisp.h" |
32 #include "w32term.h" | 33 #include "w32term.h" |
33 #include "frame.h" | 34 #include "frame.h" |
34 #include "window.h" | 35 #include "window.h" |
4508 by x_get_arg and friends, now go in the misc. alist of the frame. */ | 4509 by x_get_arg and friends, now go in the misc. alist of the frame. */ |
4509 for (tem = parameters; CONSP (tem); tem = XCDR (tem)) | 4510 for (tem = parameters; CONSP (tem); tem = XCDR (tem)) |
4510 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) | 4511 if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) |
4511 f->param_alist = Fcons (XCAR (tem), f->param_alist); | 4512 f->param_alist = Fcons (XCAR (tem), f->param_alist); |
4512 | 4513 |
4513 store_frame_param (f, Qwindow_system, Qw32); | |
4514 | |
4515 UNGCPRO; | 4514 UNGCPRO; |
4516 | 4515 |
4517 /* Make sure windows on this frame appear in calls to next-window | 4516 /* Make sure windows on this frame appear in calls to next-window |
4518 and similar functions. */ | 4517 and similar functions. */ |
4519 Vwindow_list = Qnil; | 4518 Vwindow_list = Qnil; |
7576 if (!EQ (bg, Fframe_parameter (frame, Qbackground_color))) | 7575 if (!EQ (bg, Fframe_parameter (frame, Qbackground_color))) |
7577 Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg), | 7576 Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg), |
7578 Qnil)); | 7577 Qnil)); |
7579 } | 7578 } |
7580 | 7579 |
7581 Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qw32), Qnil)); | |
7582 | |
7583 f->no_split = 1; | 7580 f->no_split = 1; |
7584 | 7581 |
7585 UNGCPRO; | 7582 UNGCPRO; |
7586 | 7583 |
7587 /* It is now ok to make the frame official even if we get an error | 7584 /* It is now ok to make the frame official even if we get an error |
9209 InitCommonControls (); | 9206 InitCommonControls (); |
9210 } | 9207 } |
9211 | 9208 |
9212 #undef abort | 9209 #undef abort |
9213 | 9210 |
9214 void w32_abort (void) NO_RETURN; | |
9215 | |
9216 void | 9211 void |
9217 w32_abort() | 9212 w32_abort() |
9218 { | 9213 { |
9219 int button; | 9214 int button; |
9220 button = MessageBox (NULL, | 9215 button = MessageBox (NULL, |