auto upstream

4 files changed, 38 insertions, 6 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
diff --git a/src/fileio.c b/src/fileio.c
index e76f2bc2420..1b293e3a971 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -251,7 +251,7 @@ static Lisp_Object Qfile_acl;
 static Lisp_Object Qset_file_acl;
 static Lisp_Object Qfile_newer_than_file_p;
 Lisp_Object Qinsert_file_contents;
-Lisp_Object Qchoose_write_coding_system;
+static Lisp_Object Qchoose_write_coding_system;
 Lisp_Object Qwrite_region;
 static Lisp_Object Qverify_visited_file_modtime;
 static Lisp_Object Qset_visited_file_modtime;
diff --git a/src/window.h b/src/window.h
index f28ce1424d0..0f4f242641e 100644
--- a/src/window.h
+++ b/src/window.h
@@ -333,13 +333,15 @@ struct window
        the frame image that window_end_pos did not get onto the frame.  */
     unsigned window_end_valid : 1;
 
-    /* Nonzero if we have highlighted the region (or any part of it).  */
-    unsigned region_showing : 1;
-
     /* Amount by which lines of this window are scrolled in
        y-direction (smooth scrolling).  */
     int vscroll;
 
+    /* If we have highlighted the region (or any part of it), the mark
+       position or -1 (the latter is used by the iterator for internal
+       purposes); otherwise zero.  */
+    ptrdiff_t region_showing;
+
     /* Z_BYTE - buffer position of the last glyph in the current matrix of W.
        Should be nonnegative, and only valid if window_end_valid is nonzero.  */
     ptrdiff_t window_end_bytepos;
diff --git a/src/xdisp.c b/src/xdisp.c
index 33fe82e165e..fe6aa8ad8c3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10807,7 +10807,7 @@ window_buffer_changed (struct window *w)
 
   return (((BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)) != w->last_had_star)
           || ((!NILP (Vtransient_mark_mode) && !NILP (BVAR (b, mark_active)))
-              != w->region_showing));
+              != (w->region_showing != 0)));
 }
 
 /* Nonzero if W has %c in its mode line and mode line should be updated.  */
@@ -13070,6 +13070,17 @@ redisplay_internal (void)
       clear_garbaged_frames ();
     }
 
+  /* If showing the region, and mark has changed, we must redisplay
+     the whole window.  The assignment to this_line_start_pos prevents
+     the optimization directly below this if-statement.  */
+  if (((!NILP (Vtransient_mark_mode)
+        && !NILP (BVAR (XBUFFER (w->buffer), mark_active)))
+       != (w->region_showing > 0))
+      || (w->region_showing
+          && w->region_showing
+          != XINT (Fmarker_position (BVAR (XBUFFER (w->buffer), mark)))))
+    CHARPOS (this_line_start_pos) = 0;
+
   /* Optimize the case that only the line containing the cursor in the
      selected window has changed.  Variables starting with this_ are
      set in display_line and record information about the line
@@ -13289,6 +13300,8 @@ redisplay_internal (void)
   ++clear_image_cache_count;
 #endif
 
+  w->region_showing = XINT (Fmarker_position (BVAR (XBUFFER (w->buffer), mark)));
+
   /* Build desired matrices, and update the display.  If
      consider_all_windows_p is non-zero, do it for all windows on all
      frames.  Otherwise do it for selected_window, only.  */
@@ -19225,7 +19238,7 @@ display_line (struct it *it)
     }
 
   /* Is IT->w showing the region?  */
-  it->w->region_showing = it->region_beg_charpos > 0;
+  it->w->region_showing = it->region_beg_charpos > 0 ? -1 : 0;
 
   /* Clear the result glyph row and enable it.  */
   prepare_desired_row (row);