Commit 66ff7ddf authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

src/bidi.c: Fix type of a variable revealed on x86_64.

parent 95e1afc6
2011-07-09 Eli Zaretskii <eliz@gnu.org> 2011-07-09 Eli Zaretskii <eliz@gnu.org>
* bidi.c (bidi_fetch_char): Fix the type of `len' according to
what STRING_CHAR_AND_LENGTH expects.
* xdisp.c (move_it_in_display_line_to): Record prev_method and * xdisp.c (move_it_in_display_line_to): Record prev_method and
prev_pos immediately before the call to set_iterator_to_next. prev_pos immediately before the call to set_iterator_to_next.
Fixes cursor motion in bidi-reordered lines with stretch glyphs Fixes cursor motion in bidi-reordered lines with stretch glyphs
......
...@@ -922,7 +922,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos, ...@@ -922,7 +922,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
{ {
if (string->s) if (string->s)
{ {
EMACS_INT len; int len;
if (!string->unibyte) if (!string->unibyte)
{ {
...@@ -937,7 +937,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos, ...@@ -937,7 +937,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
} }
else if (STRINGP (string->lstring)) else if (STRINGP (string->lstring))
{ {
EMACS_INT len; int len;
if (!string->unibyte) if (!string->unibyte)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment