aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

updated for version 7.3.111

Browse Source 
Problem:    Executing a :normal command in 'statusline' evaluation causes the
            cursor to move. (Dominique Pelle)
Solution:   When updating the cursor for 'cursorbind' allow the cursor beyond
            the end of the line.  When evaluating 'statusline' temporarily
            reset 'cursorbind'.
This commit is contained in:
Bram Moolenaar
2011-02-01 18:01:11 +01:00
parent acf1728ef5
commit 6145285c90
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/move.c
View File

@@ -2846,6 +2846,7 @@ do_check_cursorbind()
colnr_T col = curwin->w_cursor.col; colnr_T col = curwin->w_cursor.col;
win_T *old_curwin = curwin; win_T *old_curwin = curwin;
buf_T *old_curbuf = curbuf; buf_T *old_curbuf = curbuf;
int restart_edit_save;
# ifdef FEAT_VISUAL # ifdef FEAT_VISUAL
int old_VIsual_select = VIsual_select; int old_VIsual_select = VIsual_select;
int old_VIsual_active = VIsual_active; int old_VIsual_active = VIsual_active;
@@ -2875,8 +2876,12 @@ do_check_cursorbind()
curwin->w_cursor.lnum = line; curwin->w_cursor.lnum = line;
curwin->w_cursor.col = col; curwin->w_cursor.col = col;
/* Make sure the cursor is in a valid position. */ /* Make sure the cursor is in a valid position. Temporarily set
* "restart_edit" to allow the cursor to be beyond the EOL. */
restart_edit_save = restart_edit;
restart_edit = TRUE;
check_cursor(); check_cursor();
restart_edit = restart_edit_save;
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
/* Correct cursor for multi-byte character. */ /* Correct cursor for multi-byte character. */
if (has_mbyte) if (has_mbyte)

12
src/screen.c
View File

@@ -6435,6 +6435,8 @@ win_redr_custom(wp, draw_ruler)
struct stl_hlrec hltab[STL_MAX_ITEM]; struct stl_hlrec hltab[STL_MAX_ITEM];
struct stl_hlrec tabtab[STL_MAX_ITEM]; struct stl_hlrec tabtab[STL_MAX_ITEM];
int use_sandbox = FALSE; int use_sandbox = FALSE;
win_T *ewp;
int p_crb_save;
/* setup environment for the task at hand */ /* setup environment for the task at hand */
if (wp == NULL) if (wp == NULL)
@@ -6513,14 +6515,20 @@ win_redr_custom(wp, draw_ruler)
if (maxwidth <= 0) if (maxwidth <= 0)
return; return;
/* Temporarily reset 'cursorbind', we don't want a side effect from moving
* the cursor away and back. */
ewp = wp == NULL ? curwin : wp;
p_crb_save = ewp->w_p_crb;
ewp->w_p_crb = FALSE;
/* Make a copy, because the statusline may include a function call that /* Make a copy, because the statusline may include a function call that
* might change the option value and free the memory. */ * might change the option value and free the memory. */
stl = vim_strsave(stl); stl = vim_strsave(stl);
width = build_stl_str_hl(wp == NULL ? curwin : wp, width = build_stl_str_hl(ewp, buf, sizeof(buf),
buf, sizeof(buf),
stl, use_sandbox, stl, use_sandbox,
fillchar, maxwidth, hltab, tabtab); fillchar, maxwidth, hltab, tabtab);
vim_free(stl); vim_free(stl);
ewp->w_p_crb = p_crb_save;
/* Make all characters printable. */ /* Make all characters printable. */
p = transstr(buf); p = transstr(buf);

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 */
/**/
111,
/**/ /**/
110, 110,
/**/ /**/