mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 11:33:09 -08:00
Code Issues Projects Releases Wiki Activity

(try_window_reusing_current_matrix) <scrolling up>:

Browse source 
Give up if matrix starts in an ellipsis.
(init_from_display_pos): Do nothing if POS doesn't specify
a dpvec_index but the iterator has such a position.
This commit is contained in:
Gerd Moellmann 2001-03-27 18:02:26 +00:00
parent 0245398f1d
commit 607ec83c51
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,5 +1,10 @@
2001-03-27 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (try_window_reusing_current_matrix) <scrolling up>:
Give up if matrix starts in an ellipsis.
(init_from_display_pos): Do nothing if POS doesn't specify
a dpvec_index but the iterator has such a position.
* xdisp.c (init_from_display_pos): Remove unwarranted assertion.
* xmenu.c (free_frame_menubar) [USE_MOTIF]: If the shell widget's

20
src/xdisp.c
View file

@ -1871,18 +1871,6 @@ init_from_display_pos (it, w, pos)
xassert (it->dpvec && it->current.dpvec_index == 0);
it->current.dpvec_index = pos->dpvec_index;
}
else if (it->current.dpvec_index >= 0)
{
/* I don't think this can happen, just being paranoid... */
it->dpvec = NULL;
it->current.dpvec_index = -1;
if (it->s)
it->method = next_element_from_c_string;
else if (STRINGP (it->string))
it->method = next_element_from_string;
else
it->method = next_element_from_buffer;
}
CHECK_IT (it);
}
@ -10450,6 +10438,13 @@ try_window_reusing_current_matrix (w)
{
int first_row_y;
/* Don't use this method if the display starts with an ellipsis
displayed for invisible text. It's not easy to handle that case
below, and it's certainly not worth the effort since this is
not a frequent case. */
if (in_ellipses_for_invisible_text_p (&start_row->start, w))
return 0;
IF_DEBUG (debug_method_add (w, "twu1"));
/* Display up to a row that can be reused. The variable
@ -10649,6 +10644,7 @@ try_window_reusing_current_matrix (w)
/* Start displaying at the start of first_row_to_display. */
xassert (first_row_to_display->y < yb);
init_to_row_start (&it, w, first_row_to_display);
nrows_scrolled = (MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix)
- start_vpos);
it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix)