auto upstream

1 files changed, 24 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b3d3958853b..05737bb1194 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,29 @@
+2013-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_internal): Don't set w->region_showing to the
+        marker's position.
+        (display_line): Set w->region_showing to the value of
+        it->region_beg_charpos, not to -1.  This fixes redisplay
+        optimization when cursor is moved up after M->.  (Bug#13623)
+        (Bug#13626)
+        (try_scrolling): Scroll text up more if point is too close to ZV
+        and inside the scroll margin.  This makes sure point is moved
+        outside the scroll margin in these cases.
+
+        * window.h (struct window): region_showing can no longer be
+        negative.
+
 2013-02-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Tune by using memchr and memrchr.
+        * doc.c (Fsnarf_documentation):
+        * fileio.c (Fsubstitute_in_file_name):
+        * search.c (find_newline, scan_newline):
+        * xdisp.c (pos_visible_p, display_count_lines):
+        Use memchr and memrchr rather than scanning byte-by-byte.
+        * search.c (find_newline): Rename from scan_buffer.
+        Omit first arg TARGET, as it's always '\n'.  All callers changed.
+
         Clean up read_key_sequence a tiny bit more.
         * keyboard.c (read_char_x_menu_prompt) [HAVE_MENUS]:
         (read_key_sequence): Remove unused locals.