1 files changed, 31 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ade4691184..a9dae7f68aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,34 @@
+2012-05-27  Ken Brown  <kbrown@cornell.edu>
+
+        * callproc.c (Fcall_process): Restore a line that was accidentally
+        commented out in the 2011-02-13 change (bug#11547).
+
+2012-05-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * lisp.h [REL_ALLOC]: Add prototypes for external functions
+        defined on ralloc.c.
+
+        * buffer.c [REL_ALLOC]: Remove prototypes of
+        r_alloc_reset_variable, r_alloc, r_re_alloc, and r_alloc_free,
+        they are now on lisp.h.
+
+        * ralloc.c (r_alloc_inhibit_buffer_relocation): New function.
+
+        * search.c (search_buffer): Use it to inhibit relocation of buffer
+        text while re_search_2 is doing its job, because re_search_2 is
+        passed C pointers to buffer text.  (Bug#11519)
+
+        * msdos.c (internal_terminal_init) <Vwindow_system_version>:
+        Update value to 24.
+
+        * xdisp.c (move_it_to): Under MOVE_TO_Y, when restoring iterator
+        state after an additional call to move_it_in_display_line_to, keep
+        the values of it->max_ascent and it->max_descent found for the
+        entire line.
+        (pos_visible_p): Revert the comparison against bottom_y to what it
+        was in revid eliz@gnu.org-20120513182235-4p6386j761ld0nwb.
+        (Bug#11464)
+
 2012-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix coding-related core dumps with gcc -ftrapv.