thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-325

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-20 16:31:07 +00:00
parent 38f12a9e2b
commit f982106440
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ex_getln.c
View File

@@ -2053,10 +2053,10 @@ set_cmdspos_cursor()
if (has_mbyte) if (has_mbyte)
correct_cmdspos(i, c); correct_cmdspos(i, c);
#endif #endif
/* If the cmdline doesn't fit, put cursor on last visible char. */ /* If the cmdline doesn't fit, show cursor on last visible char.
* Don't move the cursor itself, so we can still append. */
if ((ccline.cmdspos += c) >= m) if ((ccline.cmdspos += c) >= m)
{ {
ccline.cmdpos = i - 1;
ccline.cmdspos -= c; ccline.cmdspos -= c;
break; break;
} }
@@ -2829,10 +2829,11 @@ put_on_cmdline(str, len, redraw)
if (has_mbyte) if (has_mbyte)
correct_cmdspos(ccline.cmdpos, c); correct_cmdspos(ccline.cmdpos, c);
#endif #endif
/* Stop cursor at the end of the screen */ /* Stop cursor at the end of the screen, but do increment the
if (ccline.cmdspos + c >= m) * insert position, so that entering a very long command
break; * works, even though you can't see it. */
ccline.cmdspos += c; if (ccline.cmdspos + c < m)
ccline.cmdspos += c;
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (has_mbyte) if (has_mbyte)
{ {
@@ -3332,7 +3333,7 @@ nextwild(xp, type, options)
/* /*
* Do wildcard expansion on the string 'str'. * Do wildcard expansion on the string 'str'.
* Chars that should not be expanded must be preceded with a backslash. * Chars that should not be expanded must be preceded with a backslash.
* Return a pointer to alloced memory containing the new string. * Return a pointer to allocated memory containing the new string.
* Return NULL for failure. * Return NULL for failure.
* *
* "orig" is the originally expanded string, copied to allocated memory. It * "orig" is the originally expanded string, copied to allocated memory. It
@@ -6111,7 +6112,7 @@ ex_window()
exmode_active = save_exmode; exmode_active = save_exmode;
/* Safety check: The old window or buffer was deleted: It's a a bug when /* Safety check: The old window or buffer was deleted: It's a bug when
* this happens! */ * this happens! */
if (!win_valid(old_curwin) || !buf_valid(old_curbuf)) if (!win_valid(old_curwin) || !buf_valid(old_curbuf))
{ {

2
src/version.c
View File

@@ -666,6 +666,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 */
/**/
325,
/**/ /**/
324, 324,
/**/ /**/