auto upstream

1 files changed, 17 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1c7771cb0d9..cbfeadc04a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2013-02-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Qchoose_write_coding_system): Now static.
+
+2013-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (window_buffer_changed): region_showing can be negative,
+        which still means region is being displayed.
+        (redisplay_internal): Resurrect code that forced redisplay of the
+        whole window when showing region and the mark has changed.  Record
+        the new mark position to allow redisplay optimizations.
+        (display_line): If it->region_beg_charpos is non-zero, set the
+        window's region_showing member to -1.  (Bug#13623)  (Bug#13626)
+
+        * window.h (struct window) <region_showing>: Declare ptrdiff_t,
+        not bitfield of 1 bit.
+
 2013-02-03  Daniel Colascione  <dancol@dancol.org>
 
         * emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC, so that