[Emacs-diffs] /srv/bzr/emacs/trunk r111751: Minor additional fix in the wake of bugs #13623 and 13626.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111751
fixes bugs: http://debbugs.gnu.org/13623 http://debbugs.gnu.org/13626
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-02-12 18:36:55 +0200
message:
  Minor additional fix in the wake of bugs #13623 and 13626.
  
   src/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->.
   src/window.h (struct window): region_showing can no longer be negative.
modified:
  src/ChangeLog
  src/window.h
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-11 23:37:18 +0000
+++ b/src/ChangeLog     2013-02-12 16:36:55 +0000
@@ -1,3 +1,15 @@
+2013-02-12  Eli Zaretskii  <address@hidden>
+
+       * 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)
+
+       * window.h (struct window): region_showing can no longer be
+       negative.
+
 2013-02-11  Paul Eggert  <address@hidden>
 
        Tune by using memchr and memrchr.

=== modified file 'src/window.h'
--- a/src/window.h      2013-02-04 15:39:55 +0000
+++ b/src/window.h      2013-02-12 16:36:55 +0000
@@ -338,8 +338,7 @@
     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.  */
+       (region start) position; otherwise zero.  */
     ptrdiff_t region_showing;
 
     /* Z_BYTE - buffer position of the last glyph in the current matrix of W.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-02-11 23:37:18 +0000
+++ b/src/xdisp.c       2013-02-12 16:36:55 +0000
@@ -13244,8 +13244,6 @@
   ++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.  */
@@ -19138,7 +19136,7 @@
     }
 
   /* Is IT->w showing the region?  */
-  it->w->region_showing = it->region_beg_charpos > 0 ? -1 : 0;
+  it->w->region_showing = it->region_beg_charpos > 0 ? it->region_beg_charpos 
: 0;
 
   /* Clear the result glyph row and enable it.  */
   prepare_desired_row (row);