aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-09-18 18:16:47 +0300
committerEli Zaretskii2011-09-18 18:16:47 +0300
commit9bade7b2d8122cf9cd0baa62ddc83bb3c4377cd5 (patch)
treebddda1469ea3462880937fdaf3f7c55ecc7462e1 /src
parent710dec6300f2fedb5df3b8ec0ee2ac9acd812eaf (diff)
downloademacs-9bade7b2d8122cf9cd0baa62ddc83bb3c4377cd5.tar.gz
emacs-9bade7b2d8122cf9cd0baa62ddc83bb3c4377cd5.zip
src/xdisp.c (reseat_at_next_visible_line_start): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5f4b3a9e7a7..a7bfd9b7d22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-09-18 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (reseat_at_next_visible_line_start): Fix last change.
4
12011-09-18 Paul Eggert <eggert@cs.ucla.edu> 52011-09-18 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix minor problem found by static checking. 7 Fix minor problem found by static checking.
diff --git a/src/xdisp.c b/src/xdisp.c
index fbf30092ca1..f4e26bf68b6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5812,7 +5812,7 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
5812 else if (skipped_p) 5812 else if (skipped_p)
5813 { 5813 {
5814 reseat (it, it->current.pos, 0); 5814 reseat (it, it->current.pos, 0);
5815 if (it->bidi_p) 5815 if (it->bidi_p && !STRINGP (it->string))
5816 { 5816 {
5817 it->bidi_it.new_paragraph = new_paragraph; 5817 it->bidi_it.new_paragraph = new_paragraph;
5818 it->bidi_it.first_elt = first_elt; 5818 it->bidi_it.first_elt = first_elt;