diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-07-31 10:05:05 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-07-31 10:05:05 +0400 |
| commit | 959067a1123547f4e111d87dab7ae152ecf901d7 (patch) | |
| tree | 51956b24cf00ce5cace9027627ec1558a7219547 /src/frame.c | |
| parent | 42d439528dd73715c12a993df023121267bbba7f (diff) | |
| download | emacs-959067a1123547f4e111d87dab7ae152ecf901d7.tar.gz | |
* 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/frame.c')
| -rw-r--r-- | src/frame.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/frame.c b/src/frame.c index f8b7201e984..c7353bf42de 100644 --- a/src/frame.c +++ b/src/frame.c @@ -69,7 +69,6 @@ Lisp_Object Qnoelisp; static Lisp_Object Qx_frame_parameter; Lisp_Object Qx_resource_name; Lisp_Object Qterminal; -Lisp_Object Qterminal_live_p; /* Frame parameters (set or reported). */ @@ -310,7 +309,7 @@ predicates which report frame's specific UI-related capabilities. */) } struct frame * -make_frame (int mini_p) +make_frame (bool mini_p) { Lisp_Object frame; register struct frame *f; @@ -2633,9 +2632,9 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist) Lisp_Object *parms; Lisp_Object *values; ptrdiff_t i, p; - int left_no_change = 0, top_no_change = 0; - int icon_left_no_change = 0, icon_top_no_change = 0; - int size_changed = 0; + bool left_no_change = 0, top_no_change = 0; + bool icon_left_no_change = 0, icon_top_no_change = 0; + bool size_changed = 0; struct gcpro gcpro1, gcpro2; i = 0; @@ -3939,8 +3938,8 @@ On Nextstep, this just calls `ns-parse-geometry'. */) #define DEFAULT_ROWS 35 #define DEFAULT_COLS 80 -int -x_figure_window_size (struct frame *f, Lisp_Object parms, int toolbar_p) +long +x_figure_window_size (struct frame *f, Lisp_Object parms, bool toolbar_p) { register Lisp_Object tem0, tem1, tem2; long window_prompting = 0; @@ -4291,7 +4290,6 @@ syms_of_frame (void) DEFSYM (Qx_frame_parameter, "x-frame-parameter"); DEFSYM (Qterminal, "terminal"); - DEFSYM (Qterminal_live_p, "terminal-live-p"); DEFSYM (Qgeometry, "geometry"); DEFSYM (Qworkarea, "workarea"); |