Commit 1c14176c authored by Paul Eggert's avatar Paul Eggert

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.
parent 3fe48822
2011-09-14 Paul Eggert <eggert@cs.ucla.edu>
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 <eggert@cs.ucla.edu>
* xselect.c: Use signed conversions more consistently (Bug#9498).
......
......@@ -3036,8 +3036,6 @@ extern struct frame *last_mouse_frame;
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 *);
......
......@@ -486,6 +486,8 @@ esprintf (char *buf, char const *format, ...)
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 @@ exprintf (char **buf, ptrdiff_t *bufsize,
return nbytes;
}
#endif
/* Act like exprintf, except take a va_list. */
ptrdiff_t
evxprintf (char **buf, ptrdiff_t *bufsize,
......
......@@ -471,7 +471,7 @@ check_display_width (EMACS_INT pos, EMACS_INT col, EMACS_INT *endpos)
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;
......
......@@ -5197,7 +5197,6 @@ x_catch_errors (dpy)
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)
......
......@@ -21293,7 +21293,7 @@ else if the text is replaced by an ellipsis. */)
? 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)
{
......
......@@ -7686,14 +7686,6 @@ x_fully_uncatch_errors (void)
}
#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)
......
......@@ -958,7 +958,6 @@ extern void x_catch_errors (Display *);
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);
......
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