[Emacs-diffs] /srv/bzr/emacs/trunk r105772: Remove unused external symbols.

[Paul Eggert]

------------------------------------------------------------
revno: 105772
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2011-09-14 14:45:51 -0700
message:
  Remove unused external symbols.
  
  * dispextern.h (calc_pixel_width_or_height): Remove decl.
  * xdisp.c (calc_pixel_width_or_height): Now static.
  * doprnt.c (exprintf) [! (HAVE_X_WINDOWS && USE_X_TOOLKIT)]: Remove.
  * indent.c (check_display_width):
  * w32term.c: Fix comment to match code.
  * xterm.c, xterm.h (x_catching_errors): Remove.
modified:
  src/ChangeLog
  src/dispextern.h
  src/doprnt.c
  src/indent.c
  src/w32term.c
  src/xdisp.c
  src/xterm.c
  src/xterm.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-14 15:47:21 +0000
+++ b/src/ChangeLog     2011-09-14 21:45:51 +0000
@@ -1,5 +1,15 @@
 2011-09-14  Paul Eggert  <address@hidden>
 
+       Remove unused external symbols.
+       * dispextern.h (calc_pixel_width_or_height): Remove decl.
+       * xdisp.c (calc_pixel_width_or_height): Now static.
+       * doprnt.c (exprintf) [! (HAVE_X_WINDOWS && USE_X_TOOLKIT)]: Remove.
+       * indent.c (check_display_width):
+       * w32term.c: Fix comment to match code.
+       * xterm.c, xterm.h (x_catching_errors): Remove.
+
+2011-09-14  Paul Eggert  <address@hidden>
+
        * xselect.c: Use signed conversions more consistently (Bug#9498).
        (selection_data_to_lisp_data): Assume incoming selection data are
        signed integers, not unsigned.  This is to be consistent with

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2011-09-09 01:06:52 +0000
+++ b/src/dispextern.h  2011-09-14 21:45:51 +0000
@@ -3036,8 +3036,6 @@
 extern int last_tool_bar_item;
 extern void reseat_at_previous_visible_line_start (struct it *);
 extern Lisp_Object lookup_glyphless_char_display (int, struct it *);
-extern int calc_pixel_width_or_height (double *, struct it *, Lisp_Object,
-                                       struct font *, int, int *);
 extern EMACS_INT compute_display_string_pos (struct text_pos *,
                                             struct bidi_string_data *,
                                             int, int *);

=== modified file 'src/doprnt.c'
--- a/src/doprnt.c      2011-09-09 01:06:52 +0000
+++ b/src/doprnt.c      2011-09-14 21:45:51 +0000
@@ -486,6 +486,8 @@
   return nbytes;
 }
 
+#if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
+
 /* Format to buffer *BUF of positive size *BUFSIZE, reallocating *BUF
    and updating *BUFSIZE if the buffer is too small, and otherwise
    behaving line esprintf.  When reallocating, free *BUF unless it is
@@ -505,6 +507,8 @@
   return nbytes;
 }
 
+#endif
+
 /* Act like exprintf, except take a va_list.  */
 ptrdiff_t
 evxprintf (char **buf, ptrdiff_t *bufsize,

=== modified file 'src/indent.c'
--- a/src/indent.c      2011-09-12 11:51:27 +0000
+++ b/src/indent.c      2011-09-14 21:45:51 +0000
@@ -471,7 +471,7 @@
   if (CONSP (val = get_char_property_and_overlay
             (make_number (pos), Qdisplay, Qnil, &overlay))
       && EQ (Qspace, XCAR (val)))
-    { /* FIXME: Use calc_pixel_width_or_height, as in term.c.  */
+    { /* FIXME: Use calc_pixel_width_or_height.  */
       Lisp_Object plist = XCDR (val), prop;
       int width = -1;
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2011-08-04 00:58:07 +0000
+++ b/src/w32term.c     2011-09-14 21:45:51 +0000
@@ -5197,7 +5197,6 @@
 x_catch_errors_unwind (old_val)
 x_check_errors (dpy, format)
 x_fully_uncatch_errors ()
-x_catching_errors ()
 x_had_errors_p (dpy)
 x_clear_errors (dpy)
 x_uncatch_errors (dpy, count)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-09-14 05:20:23 +0000
+++ b/src/xdisp.c       2011-09-14 21:45:51 +0000
@@ -21293,7 +21293,7 @@
       ? XFLOATINT (X)                          \
       : - 1)
 
-int
+static int
 calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
                            struct font *font, int width_p, int *align_to)
 {

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-09-09 01:06:52 +0000
+++ b/src/xterm.c       2011-09-14 21:45:51 +0000
@@ -7686,14 +7686,6 @@
 }
 #endif
 
-/* Nonzero if x_catch_errors has been done and not yet canceled.  */
-
-int
-x_catching_errors (void)
-{
-  return x_error_message != 0;
-}
-
 #if 0
 static unsigned int x_wire_count;
 x_trace_wire (void)

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2011-09-09 01:06:52 +0000
+++ b/src/xterm.h       2011-09-14 21:45:51 +0000
@@ -958,7 +958,6 @@
 extern void x_check_errors (Display *, const char *)
   ATTRIBUTE_FORMAT_PRINTF (2, 0);
 extern int x_had_errors_p (Display *);
-extern int x_catching_errors (void);
 extern void x_uncatch_errors (void);
 extern void x_clear_errors (Display *);
 extern void x_set_window_size (struct frame *, int, int, int);