aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.472

Browse Source 
Problem:    Crash when using ":redraw" in a BufEnter autocommand and
            switching to another tab. (驼峰)
Solution:   Move triggering the the autocommands to after correcting the
            option values. Also check the row value to be out of bounds.
            (Christian Brabandt, Sergey Khorev)
This commit is contained in:
Bram Moolenaar
2012-03-16 19:07:58 +01:00
parent 1c0b03e857
commit 5ad15df9ce
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/screen.c
View File

@@ -5371,6 +5371,12 @@ screen_line(row, coloff, endcol, clear_width
# define CHAR_CELLS 1 # define CHAR_CELLS 1
#endif #endif
/* Check for illegal row and col, just in case. */
if (row >= Rows)
row = Rows - 1;
if (endcol > Columns)
endcol = Columns;
# ifdef FEAT_CLIPBOARD # ifdef FEAT_CLIPBOARD
clip_may_clear_selection(row, row); clip_may_clear_selection(row, row);
# endif # endif

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
472,
/**/ /**/
471, 471,
/**/ /**/

15
src/window.c
View File

@@ -3676,13 +3676,6 @@ enter_tabpage(tp, old_curbuf)
win_enter_ext(tp->tp_curwin, FALSE, TRUE); win_enter_ext(tp->tp_curwin, FALSE, TRUE);
prevwin = next_prevwin; prevwin = next_prevwin;
#ifdef FEAT_AUTOCMD
apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
if (old_curbuf != curbuf)
apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
#endif
last_status(FALSE); /* status line may appear or disappear */ last_status(FALSE); /* status line may appear or disappear */
(void)win_comp_pos(); /* recompute w_winrow for all windows */ (void)win_comp_pos(); /* recompute w_winrow for all windows */
must_redraw = CLEAR; /* need to redraw everything */ must_redraw = CLEAR; /* need to redraw everything */
@@ -3712,6 +3705,14 @@ enter_tabpage(tp, old_curbuf)
gui_may_update_scrollbars(); gui_may_update_scrollbars();
#endif #endif
#ifdef FEAT_AUTOCMD
/* Apply autocommands after updating the display, when 'rows' and
* 'columns' have been set correctly. */
apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
if (old_curbuf != curbuf)
apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
#endif
redraw_all_later(CLEAR); redraw_all_later(CLEAR);
} }