summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2011-09-14 01:20:23 -0400
committerEli Zaretskii <eliz@gnu.org>2011-09-14 01:20:23 -0400
commit46888499da0bb61ce47d339275d5a0c757a02eb2 (patch)
tree3311aebfd309bff4829000c1d9426f79abd17733
parent4d61f28dcc05c0c8ce8021f720fba58e21fd1162 (diff)
downloademacs-46888499da0bb61ce47d339275d5a0c757a02eb2.tar.gz
emacs-46888499da0bb61ce47d339275d5a0c757a02eb2.tar.bz2
emacs-46888499da0bb61ce47d339275d5a0c757a02eb2.zip
xdisp.c (try_window_reusing_current_matrix): Fix incorrect computation of loop end.
src/xdisp.c (try_window_reusing_current_matrix): Fix incorrect computation of loop end. Reported by Johan Bockgård <bojohan@gnu.org>.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9e04455102d..9f8361153a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-14 Eli Zaretskii <eliz@gnu.org>
+
+ * xdisp.c (try_window_reusing_current_matrix): Fix incorrect
+ computation of loop end. Reported by Johan Bockgård
+ <bojohan@gnu.org>.
+
2011-09-13 Chong Yidong <cyd@stupidchicken.com>
* frame.c (Fother_visible_frames_p): Function deleted.
diff --git a/src/xdisp.c b/src/xdisp.c
index 277658fd357..3ebf7d19b1f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16077,7 +16077,7 @@ try_window_reusing_current_matrix (struct window *w)
if (row < bottom_row)
{
struct glyph *glyph = row->glyphs[TEXT_AREA] + w->cursor.hpos;
- struct glyph *end = glyph + row->used[TEXT_AREA];
+ struct glyph *end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
/* Can't use this optimization with bidi-reordered glyph
rows, unless cursor is already at point. */