[Emacs-diffs] /srv/bzr/emacs/trunk r111128: * frame.h (x_char_width, x_char_height): Remove prototypes.

[Dmitry Antipov]

------------------------------------------------------------
revno: 111128
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-06 17:48:11 +0400
message:
  * 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.
modified:
  src/ChangeLog
  src/frame.c
  src/frame.h
  src/keyboard.c
  src/nsfns.m
  src/w32fns.c
  src/w32term.h
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-06 07:31:58 +0000
+++ b/src/ChangeLog     2012-12-06 13:48:11 +0000
@@ -1,3 +1,16 @@
+2012-12-06  Dmitry Antipov  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix a recently-introduced delete-process race condition.

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-12-06 06:23:51 +0000
+++ b/src/frame.c       2012-12-06 13:48:11 +0000
@@ -2276,7 +2276,7 @@
   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 @@
   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);

=== modified file 'src/frame.h'
--- a/src/frame.h       2012-12-04 15:15:30 +0000
+++ b/src/frame.h       2012-12-06 13:48:11 +0000
@@ -1255,8 +1255,6 @@
 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);

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-11-27 05:17:07 +0000
+++ b/src/keyboard.c    2012-12-06 13:48:11 +0000
@@ -1116,8 +1116,7 @@
 
   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 @@
    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 @@
   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 */

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2012-11-03 05:59:17 +0000
+++ b/src/nsfns.m       2012-12-06 13:48:11 +0000
@@ -2243,20 +2243,6 @@
 
 
 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)
 {
   return FRAME_NS_DISPLAY_INFO (f)->n_planes;

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-12-03 01:08:31 +0000
+++ b/src/w32fns.c      2012-12-06 13:48:11 +0000
@@ -4866,18 +4866,6 @@
 }
 
 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)
 {
   return FRAME_W32_DISPLAY_INFO (f)->n_planes;

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2012-11-23 15:39:48 +0000
+++ b/src/w32term.h     2012-12-06 13:48:11 +0000
@@ -217,8 +217,6 @@
 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);

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2012-11-12 04:00:55 +0000
+++ b/src/xfns.c        2012-12-06 13:48:11 +0000
@@ -3848,20 +3848,6 @@
   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
  ************************************************************************/