Commit 1700db3c authored by Dmitry Antipov's avatar 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.
parent 347966bf
2012-12-06 Dmitry Antipov <dmantipov@yandex.ru>
* 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 <eggert@cs.ucla.edu>
Fix a recently-introduced delete-process race condition.
......
......@@ -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);
......
......@@ -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);
......
......@@ -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 */
......
......@@ -2242,20 +2242,6 @@ and GNUstep implementations ("distributor-specific release
}
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)
{
......
......@@ -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)
{
......
......@@ -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);
......
......@@ -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
************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment