diff options
| author | Dmitry Antipov | 2013-07-31 10:05:05 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-07-31 10:05:05 +0400 |
| commit | 959067a1123547f4e111d87dab7ae152ecf901d7 (patch) | |
| tree | 51956b24cf00ce5cace9027627ec1558a7219547 /src/nsfns.m | |
| parent | 42d439528dd73715c12a993df023121267bbba7f (diff) | |
| download | emacs-959067a1123547f4e111d87dab7ae152ecf901d7.tar.gz emacs-959067a1123547f4e111d87dab7ae152ecf901d7.zip | |
* frame.c (make_frame, x_set_frame_parameters): Use bool for boolean.
(x_figure_window_size): Likewise. Adjust to return long.
(syms_of_frame): Do not DEFSYM Qterminal_live_p.
(toplevel): Move Qterminal_live_p to...
* terminal.c (toplevel): ...here, make it static, and...
(syms_of_terminal): ...DEFSYM here.
* frame.h (Qterminal_live_p): Remove declaration.
(make_frame, x_figure_window_size): Adjust prototype.
* nsfns.m (Fx_create_frame): Use long for window flags.
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 121ac539646..71f971a9f5b 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1068,7 +1068,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 1068 | Lisp_Object frame, tem; | 1068 | Lisp_Object frame, tem; |
| 1069 | Lisp_Object name; | 1069 | Lisp_Object name; |
| 1070 | int minibuffer_only = 0; | 1070 | int minibuffer_only = 0; |
| 1071 | int window_prompting = 0; | 1071 | long window_prompting = 0; |
| 1072 | int width, height; | 1072 | int width, height; |
| 1073 | ptrdiff_t count = specpdl_ptr - specpdl; | 1073 | ptrdiff_t count = specpdl_ptr - specpdl; |
| 1074 | struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | 1074 | struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |