From 959067a1123547f4e111d87dab7ae152ecf901d7 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 31 Jul 2013 10:05:05 +0400 Subject: [PATCH] * 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. --- src/ChangeLog | 12 ++++++++++++ src/frame.c | 14 ++++++-------- src/frame.h | 6 +++--- src/nsfns.m | 2 +- src/terminal.c | 4 ++++ 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fd54607049..b359b8df09 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2013-07-31 Dmitry Antipov + + * 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. + 2013-07-30 Paul Eggert Fix tempfile bug on platforms lacking mkostemp and mkstemp (Bug#14986). diff --git a/src/frame.c b/src/frame.c index f8b7201e98..c7353bf42d 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"); diff --git a/src/frame.h b/src/frame.h index 31d3e73c3c..2e54477009 100644 --- a/src/frame.h +++ b/src/frame.h @@ -952,7 +952,7 @@ typedef struct frame *FRAME_PTR; extern Lisp_Object Qframep, Qframe_live_p; extern Lisp_Object Qtty, Qtty_type; extern Lisp_Object Qtty_color_mode; -extern Lisp_Object Qterminal, Qterminal_live_p; +extern Lisp_Object Qterminal; extern Lisp_Object Qnoelisp; extern struct frame *last_nonminibuf_frame; @@ -962,7 +962,7 @@ extern struct frame *decode_window_system_frame (Lisp_Object); extern struct frame *decode_live_frame (Lisp_Object); extern struct frame *decode_any_frame (Lisp_Object); extern struct frame *make_initial_frame (void); -extern struct frame *make_frame (int); +extern struct frame *make_frame (bool); #ifdef HAVE_WINDOW_SYSTEM extern struct frame *make_minibuffer_frame (void); extern struct frame *make_frame_without_minibuffer (Lisp_Object, @@ -1242,7 +1242,7 @@ extern void x_set_scroll_bar_width (struct frame *, Lisp_Object, extern Lisp_Object x_icon_type (struct frame *); -extern int x_figure_window_size (struct frame *, Lisp_Object, int); +extern long x_figure_window_size (struct frame *, Lisp_Object, bool); extern void x_set_alpha (struct frame *, Lisp_Object, Lisp_Object); diff --git a/src/nsfns.m b/src/nsfns.m index 121ac53964..71f971a9f5 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1068,7 +1068,7 @@ This function is an internal primitive--use `make-frame' instead. */) Lisp_Object frame, tem; Lisp_Object name; int minibuffer_only = 0; - int window_prompting = 0; + long window_prompting = 0; int width, height; ptrdiff_t count = specpdl_ptr - specpdl; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; diff --git a/src/terminal.c b/src/terminal.c index c55fd4eb07..4b5532e3a4 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -39,6 +39,8 @@ static int next_terminal_id; /* The initial terminal device, created by initial_term_init. */ struct terminal *initial_terminal; +static Lisp_Object Qterminal_live_p; + static void delete_initial_terminal (struct terminal *); /* This setter is used only in this file, so it can be private. */ @@ -549,6 +551,8 @@ Each function is called with argument, the terminal. This may be called just before actually deleting the terminal, or some time later. */); Vdelete_terminal_functions = Qnil; + + DEFSYM (Qterminal_live_p, "terminal-live-p"); DEFSYM (Qdelete_terminal_functions, "delete-terminal-functions"); DEFSYM (Qrun_hook_with_args, "run-hook-with-args"); -- 2.20.1