diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-07-09 19:23:49 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-07-09 19:23:49 +0300 |
| commit | 66ff7ddf932697fc7d114ae6f0602fb57ec28eda (patch) | |
| tree | 5c3a068afbf9eea31bbf67f5acbe0809873628f0 | |
| parent | 95e1afc692e2f999fa23daa3ecaa439db5830cc5 (diff) | |
| download | emacs-66ff7ddf932697fc7d114ae6f0602fb57ec28eda.tar.gz | |
src/bidi.c: Fix type of a variable revealed on x86_64.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/bidi.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7dc419ef731..e59c72643d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 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 prev_pos immediately before the call to set_iterator_to_next. Fixes cursor motion in bidi-reordered lines with stretch glyphs diff --git a/src/bidi.c b/src/bidi.c index 5b26ecf0854..a25e2489547 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -922,7 +922,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos, { if (string->s) { - EMACS_INT len; + int len; if (!string->unibyte) { @@ -937,7 +937,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos, } else if (STRINGP (string->lstring)) { - EMACS_INT len; + int len; if (!string->unibyte) { |