upstream

1 files changed, 20 insertions, 0 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