Merge from trunk.

1 files changed, 49 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 00845a4c188..c2cf656b101 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
-2011-10-11  Paul Eggert  <eggert@cs.ucla.edu>
+2011-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix integer width and related issues.
+        Fix integer width and related bugs.
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
         (allocate_vectorlike, buffer_memory_full, struct sdata, SDATA_SIZE)
         (string_bytes, check_sblock, allocate_string_data):
@@ -784,6 +784,53 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_level_of_next_char):
+        * xdisp.c (get_visually_first_element): Remove old incorrect
+        comments regarding the Unicode Line Separator character.
+
+        * bidi.c (bidi_init_it): Initialize paragraph_dir to NEUTRAL_DIR.
+
+2011-10-12  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * alloc.c (Fgc_status): Do not access beyond zombies array
+        boundary if nzombies > MAX_ZOMBIES.
+        * alloc.c (dump_zombies): Add missing format specifier.
+
+2011-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (set_cursor_from_row): Simplify conditionals,
+        to pacify GCC 4.6.1 x86-64 with -O2 -Wstrict-overflow.
+
+        * lread.c (read_escape): Allow hex escapes as large as ?\xfffffff.
+        Some packages use them to denote characters with modifiers.
+
+2011-10-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h (GCPRO1_VAR, GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR)
+        (GCPRO5_VAR, GCPRO6_VAR, UNGCPRO_VAR): Add whitespace to avoid
+        matching a pp-number.  Rename parameter var to var1.
+
+2011-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (Finternal_complete_buffer): Fix last change (bug#9709).
+
+2011-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * callint.c (Fcall_interactively): Give a more explicit error for the
+        'c' case with a non-character input.  (Bug#8479)
+
+2011-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (hscroll_window_tree): Support hscroll in right-to-left
+        lines.
+        (set_cursor_from_row): Fix cursor positioning in mixed L2R+R2L
+        lines that are hscrolled on the left.
+
+        * dispnew.c (buffer_posn_from_coords): Account for a possible
+        presence of header-line.  (Bug#4426)
+
 2011-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * buffer.c (syms_of_buffer) <enable-multibyte-characters>: Don't