From 1700db3c71ec3fde2e263b3325a5b5f5315a4ef9 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 6 Dec 2012 17:48:11 +0400 Subject: [PATCH] * frame.h (x_char_width, x_char_height): Remove prototypes. * w32term.h (x_char_width, x_char_height): Likewise. * xfns.c (x_char_width, x_char_height): Remove. * w32fns.c (x_char_width, x_char_height): Likewise. * nsfns.c (x_char_width, x_char_height): Likewise. * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for all window frames. (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT. * keyboard.c (command_loop_1): Remove prototype. (command_loop_2, top_level_1): Add static to match prototype. --- src/ChangeLog | 13 +++++++++++++ src/frame.c | 4 ++-- src/frame.h | 2 -- src/keyboard.c | 7 +++---- src/nsfns.m | 14 -------------- src/w32fns.c | 12 ------------ src/w32term.h | 2 -- src/xfns.c | 14 -------------- 8 files changed, 18 insertions(+), 50 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 542b2c0174a..2fefef1275b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2012-12-06 Dmitry Antipov + + * frame.h (x_char_width, x_char_height): Remove prototypes. + * w32term.h (x_char_width, x_char_height): Likewise. + * xfns.c (x_char_width, x_char_height): Remove. + * w32fns.c (x_char_width, x_char_height): Likewise. + * nsfns.c (x_char_width, x_char_height): Likewise. + * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for + all window frames. + (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT. + * keyboard.c (command_loop_1): Remove prototype. + (command_loop_2, top_level_1): Add static to match prototype. + 2012-12-06 Paul Eggert Fix a recently-introduced delete-process race condition. diff --git a/src/frame.c b/src/frame.c index d94164e0c14..ce9ae45eb90 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2276,7 +2276,7 @@ For a terminal frame, the value is always 1. */) struct frame *f = decode_any_frame (frame); if (FRAME_WINDOW_P (f)) - return make_number (x_char_height (f)); + return make_number (FRAME_LINE_HEIGHT (f)); else #endif return make_number (1); @@ -2295,7 +2295,7 @@ For a terminal screen, the value is always 1. */) struct frame *f = decode_any_frame (frame); if (FRAME_WINDOW_P (f)) - return make_number (x_char_width (f)); + return make_number (FRAME_COLUMN_WIDTH (f)); else #endif return make_number (1); diff --git a/src/frame.h b/src/frame.h index e8241fea88f..589b45fc0ff 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1255,8 +1255,6 @@ extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y); extern void x_make_frame_visible (struct frame *f); extern void x_make_frame_invisible (struct frame *f); extern void x_iconify_frame (struct frame *f); -extern int x_char_width (struct frame *f); -extern int x_char_height (struct frame *f); extern int x_pixel_width (struct frame *f); extern int x_pixel_height (struct frame *f); extern void x_set_frame_alpha (struct frame *f); diff --git a/src/keyboard.c b/src/keyboard.c index 60e6d71cdff..1bb4c85dd7b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1116,8 +1116,7 @@ cmd_error_internal (Lisp_Object data, const char *context) Vsignaling_function = Qnil; } - -Lisp_Object command_loop_1 (void); + static Lisp_Object command_loop_2 (Lisp_Object); static Lisp_Object top_level_1 (Lisp_Object); @@ -1154,7 +1153,7 @@ command_loop (void) value to us. A value of nil means that command_loop_1 itself returned due to end of file (or end of kbd macro). */ -Lisp_Object +static Lisp_Object command_loop_2 (Lisp_Object ignore) { register Lisp_Object val; @@ -1172,7 +1171,7 @@ top_level_2 (void) return Feval (Vtop_level, Qnil); } -Lisp_Object +static Lisp_Object top_level_1 (Lisp_Object ignore) { /* On entry to the outer level, run the startup file */ diff --git a/src/nsfns.m b/src/nsfns.m index e8bf696e7f5..428cfcb9a10 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -2242,20 +2242,6 @@ x_pixel_height (struct frame *f) } -int -x_char_width (struct frame *f) -{ - return FRAME_COLUMN_WIDTH (f); -} - - -int -x_char_height (struct frame *f) -{ - return FRAME_LINE_HEIGHT (f); -} - - int x_screen_planes (struct frame *f) { diff --git a/src/w32fns.c b/src/w32fns.c index 044c377f496..6801fc68054 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4865,18 +4865,6 @@ x_pixel_height (register struct frame *f) return FRAME_PIXEL_HEIGHT (f); } -int -x_char_width (register struct frame *f) -{ - return FRAME_COLUMN_WIDTH (f); -} - -int -x_char_height (register struct frame *f) -{ - return FRAME_LINE_HEIGHT (f); -} - int x_screen_planes (register struct frame *f) { diff --git a/src/w32term.h b/src/w32term.h index 28d4ca6c490..af1a79e21c9 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -217,8 +217,6 @@ extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y); extern void x_make_frame_visible (struct frame *f); extern void x_make_frame_invisible (struct frame *f); extern void x_iconify_frame (struct frame *f); -extern int x_char_width (struct frame *f); -extern int x_char_height (struct frame *f); extern int x_pixel_width (struct frame *f); extern int x_pixel_height (struct frame *f); extern void x_set_frame_alpha (struct frame *f); diff --git a/src/xfns.c b/src/xfns.c index 1f98e9fc8c7..7e832c3a95f 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3848,20 +3848,6 @@ x_pixel_height (register struct frame *f) return FRAME_PIXEL_HEIGHT (f); } -int -x_char_width (register struct frame *f) -{ - return FRAME_COLUMN_WIDTH (f); -} - -int -x_char_height (register struct frame *f) -{ - return FRAME_LINE_HEIGHT (f); -} - - - /************************************************************************ X Displays ************************************************************************/ -- 2.39.5