auto upstream

1 files changed, 24 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d39a32e883..e945e221593 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2013-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (x_draw_vertical_border): For a window that is neither
+        the leftmost nor the rightmost, redraw both the left and the right
+        vertical borders.  (Bug#13723)
+
+2013-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xml.c (init_libxml2_functions):
+        * sound.c (sound_warning):
+        * sheap.c (report_sheap_usage):
+        * process.c (wait_reading_process_output):
+        * msdos.c (XMenuActivate):
+        * macros.c (Fstart_kbd_macro, Fend_kbd_macro):
+        * keyboard.c (top_level_1):
+        * editfns.c (Fmessage, Fmessage_box):
+        * callint.c (Fcall_interactively):
+        * fns.c (Fyes_or_no_p): Prefer `message1' over `message'.
+
+2013-02-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (syms_of_xterm): Move scroll-bar-adjust-thumb-portion ...
+        * frame.c (syms_of_frame): ... to here.
+
 2013-02-16  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (sys_chown): Remove unused function.