Mercurial > emacs
changeset 21028:0e9e9906db7b
(try_window_id): Use DEC_BOTH unconditionally.
(display_text_line): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 03 Mar 1998 01:29:16 +0000 |
| parents | 517de9005275 |
| children | 3f47b0364c2a |
| files | src/xdisp.c |
| diffstat | 1 files changed, 5 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Tue Mar 03 01:01:55 1998 +0000 +++ b/src/xdisp.c Tue Mar 03 01:29:16 1998 +0000 @@ -2520,7 +2520,6 @@ int selective = (INTEGERP (current_buffer->selective_display) ? XINT (current_buffer->selective_display) : !NILP (current_buffer->selective_display) ? -1 : 0); - int multibyte = !NILP (current_buffer->enable_multibyte_characters); struct position val, bp, ep, xp, pp; int scroll_amount = 0; int delta; @@ -2599,11 +2598,7 @@ val.hpos = bp.prevhpos - width + lmargin; val.tab_offset = bp.tab_offset + bp.prevhpos - width; did_motion = 1; - pos--; - if (multibyte) - DEC_POS (pos_byte); - else - pos_byte--; + DEC_BOTH (pos, pos_byte); } bp.vpos = vpos; @@ -2866,11 +2861,7 @@ { val.hpos = xp.prevhpos - width + lmargin; val.tab_offset = xp.tab_offset + bp.prevhpos - width; - pos--; - if (multibyte) - DEC_POS (pos_byte); - else - pos_byte--; + DEC_BOTH (pos, pos_byte); } blank_end_of_window = 1; @@ -3277,12 +3268,9 @@ if (left_edge->vpos > vpos || left_edge->hpos > 0) { - pos = left_edge->bufpos - 1; + pos = left_edge->bufpos; pos_byte = left_edge->bytepos; - if (multibyte) - DEC_POS (pos_byte); - else - pos_byte--; + DEC_BOTH (pos, pos_byte); hpos = left_edge->prevhpos; } else @@ -3926,11 +3914,7 @@ { *p1++ = fix_glyph (f, continuer, 0); val.vpos = 0; - lastpos--; - if (multibyte) - DEC_POS (lastpos_byte); - else - lastpos_byte--; + DEC_BOTH (lastpos, lastpos_byte); val.tab_offset = taboffset + width; } }