mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 01:34:21 +00:00
(redisplay_internal): Remove redundant test and collapse both branches
into one.
This commit is contained in:
parent
53be4cdb51
commit
e0840eefe1
2 changed files with 16 additions and 23 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2009-08-29 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* xdisp.c (redisplay_internal): Remove redundant test and collapse
|
||||
both branches into one.
|
||||
|
||||
2009-08-29 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* emacs.c (USAGE1): Remove --(no-)multibyte, --(no-)unibyte.
|
||||
|
|
|
|||
34
src/xdisp.c
34
src/xdisp.c
|
|
@ -11658,29 +11658,17 @@ redisplay_internal (preserve_echo_area)
|
|||
= MATRIX_ROW (w->current_matrix, this_line_vpos + 1);
|
||||
int delta, delta_bytes;
|
||||
|
||||
if (Z - CHARPOS (tlendpos) == ZV)
|
||||
{
|
||||
/* This line ends at end of (accessible part of)
|
||||
buffer. There is no newline to count. */
|
||||
delta = (Z
|
||||
- CHARPOS (tlendpos)
|
||||
- MATRIX_ROW_START_CHARPOS (row));
|
||||
delta_bytes = (Z_BYTE
|
||||
- BYTEPOS (tlendpos)
|
||||
- MATRIX_ROW_START_BYTEPOS (row));
|
||||
}
|
||||
else
|
||||
{
|
||||
/* This line ends in a newline. Must take
|
||||
account of the newline and the rest of the
|
||||
text that follows. */
|
||||
delta = (Z
|
||||
- CHARPOS (tlendpos)
|
||||
- MATRIX_ROW_START_CHARPOS (row));
|
||||
delta_bytes = (Z_BYTE
|
||||
- BYTEPOS (tlendpos)
|
||||
- MATRIX_ROW_START_BYTEPOS (row));
|
||||
}
|
||||
/* We used to distinguish between two cases here,
|
||||
conditioned by Z - CHARPOS (tlendpos) == ZV, for
|
||||
when the line ends in a newline or the end of the
|
||||
buffer's accessible portion. But both cases did
|
||||
the same, so they were collapsed. */
|
||||
delta = (Z
|
||||
- CHARPOS (tlendpos)
|
||||
- MATRIX_ROW_START_CHARPOS (row));
|
||||
delta_bytes = (Z_BYTE
|
||||
- BYTEPOS (tlendpos)
|
||||
- MATRIX_ROW_START_BYTEPOS (row));
|
||||
|
||||
increment_matrix_positions (w->current_matrix,
|
||||
this_line_vpos + 1,
|
||||
|
|
|
|||
Loading…
Reference in a new issue