upstream

9 files changed, 30 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f8361153a1..3dbddc9b215 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+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).
+        (selection_data_to_lisp_data): Assume incoming selection data are
+        signed integers, not unsigned.  This is to be consistent with
+        outgoing selection data, which was modified to use signed integers
+        in as part of the fix to Bug#9196 in response to Jan D.'s comment
+        in <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9196#32> that X11
+        expects long, not unsigned long.
+
 2011-09-14  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (try_window_reusing_current_matrix): Fix incorrect
diff --git a/src/dispextern.h b/src/dispextern.h
index bc75dc5d2e6..8a1d8e7948e 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3064,8 +3064,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 *);
diff --git a/src/doprnt.c b/src/doprnt.c
index 8db7c0f2ada..b4d13c59137 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -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,
diff --git a/src/indent.c b/src/indent.c
index bae9ab1b46d..e00d2152577 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -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;
 
diff --git a/src/w32term.c b/src/w32term.c
index 98c4a391953..8d9d8f72029 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -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)
diff --git a/src/xdisp.c b/src/xdisp.c
index 241571cd9df..32007f52f4d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21398,7 +21398,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)
 {
diff --git a/src/xselect.c b/src/xselect.c
index 241622e81b3..29e8552bb9c 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1685,9 +1685,9 @@ selection_data_to_lisp_data (Display *display, const unsigned char *data,
      convert it to a cons of integers, 16 bits in each half.
    */
   else if (format == 32 && size == sizeof (int))
-    return INTEGER_TO_CONS (((unsigned int *) data) [0]);
+    return INTEGER_TO_CONS (((int *) data) [0]);
   else if (format == 16 && size == sizeof (short))
-    return make_number (((unsigned short *) data) [0]);
+    return make_number (((short *) data) [0]);
 
   /* Convert any other kind of data to a vector of numbers, represented
      as above (as an integer, or a cons of two 16 bit integers.)
@@ -1699,7 +1699,7 @@ selection_data_to_lisp_data (Display *display, const unsigned char *data,
       v = Fmake_vector (make_number (size / 2), make_number (0));
       for (i = 0; i < size / 2; i++)
         {
-          EMACS_INT j = ((unsigned short *) data) [i];
+          EMACS_INT j = ((short *) data) [i];
           Faset (v, make_number (i), make_number (j));
         }
       return v;
@@ -1711,7 +1711,7 @@ selection_data_to_lisp_data (Display *display, const unsigned char *data,
                                     make_number (0));
       for (i = 0; i < size / X_LONG_SIZE; i++)
         {
-          unsigned int j = ((unsigned int *) data) [i];
+          int j = ((int *) data) [i];
           Faset (v, make_number (i), INTEGER_TO_CONS (j));
         }
       return v;
diff --git a/src/xterm.c b/src/xterm.c
index 29f1a85d2c6..0c096e8f729 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7700,14 +7700,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)
diff --git a/src/xterm.h b/src/xterm.h
index 5c9365c1269..11d5d50d952 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -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);