summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-05-15 17:43:55 +0300
committerEli Zaretskii <eliz@gnu.org>2010-05-15 17:43:55 +0300
commit2e9abc3d5340f07c181d3cbeba5d92d36dea5a34 (patch)
treeab74be42860160c21d0a1e15dc95742ed29d7b80
parent7107842975be5da82d085fd97a7bddbbf16b30f9 (diff)
downloademacs-2e9abc3d5340f07c181d3cbeba5d92d36dea5a34.tar.gz
Avoid crashes when stepping with right-arrow through "^L^L".
bidi.c (bidi_paragraph_init): Remove redundant assertion that we are at the beginning of a line after call to bidi_find_paragraph_start.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/bidi.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 32413ae11c3..30bd78e208c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
* bidi.c (bidi_paragraph_init): Don't leave alone garbage values
of bidi_it->paragraph_dir. Call bidi_initialize if needed.
+ (bidi_paragraph_init): Remove redundant assertion that we are at
+ the beginning of a line after call to bidi_find_paragraph_start.
* xdisp.c (Fcurrent_bidi_paragraph_direction): New function.
(syms_of_xdisp): Defsubr it.
diff --git a/src/bidi.c b/src/bidi.c
index 6939e51159f..dbc95608fea 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -916,11 +916,6 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
middle of it. Find where this paragraph starts. */
bytepos = bidi_find_paragraph_start (pos, bytepos);
- /* We should always be at the beginning of a new line at this
- point. */
- if (!(bytepos == BEGV_BYTE || FETCH_CHAR (bytepos - 1) == '\n'))
- abort ();
-
bidi_it->separator_limit = -1;
bidi_it->new_paragraph = 0;
ch = FETCH_CHAR (bytepos);