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

updated for version 7.1-156

Browse Source
This commit is contained in:
Bram Moolenaar
2007-11-11 18:17:28 +00:00
parent 07d0677855
commit 81870894a7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ex_docmd.c
View File

@@ -666,7 +666,7 @@ do_exmode(improved)
if (ex_pressedreturn) if (ex_pressedreturn)
{ {
/* go up one line, to overwrite the ":<CR>" line, so the /* go up one line, to overwrite the ":<CR>" line, so the
* output doensn't contain empty lines. */ * output doesn't contain empty lines. */
msg_row = prev_msg_row; msg_row = prev_msg_row;
if (prev_msg_row == Rows - 1) if (prev_msg_row == Rows - 1)
msg_row--; msg_row--;
@@ -2760,7 +2760,7 @@ find_command(eap, full)
/* /*
* Isolate the command and search for it in the command table. * Isolate the command and search for it in the command table.
* Exeptions: * Exceptions:
* - the 'k' command can directly be followed by any character. * - the 'k' command can directly be followed by any character.
* - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r' * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
* but :sre[wind] is another command, as are :scrip[tnames], * but :sre[wind] is another command, as are :scrip[tnames],
@@ -6677,7 +6677,7 @@ ex_shell(eap)
* The list should be allocated using alloc(), as should each item in the * The list should be allocated using alloc(), as should each item in the
* list. This function takes over responsibility for freeing the list. * list. This function takes over responsibility for freeing the list.
* *
* XXX The list is made into the arggument list. This is freed using * XXX The list is made into the argument list. This is freed using
* FreeWild(), which does a series of vim_free() calls, unless the two defines * FreeWild(), which does a series of vim_free() calls, unless the two defines
* __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
* routine _fnexplodefree() is used. This may cause problems, but as the drop * routine _fnexplodefree() is used. This may cause problems, but as the drop
@@ -7795,7 +7795,7 @@ ex_cd(eap)
if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged() if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
&& !eap->forceit) && !eap->forceit)
{ {
EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)")); EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
return; return;
} }
@@ -9391,7 +9391,7 @@ eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
if (src > srcstart && src[-1] == '\\') if (src > srcstart && src[-1] == '\\')
{ {
*usedlen = 0; *usedlen = 0;
STRCPY(src - 1, src); /* remove backslash */ mch_memmove(src - 1, src, STRLEN(src) + 1); /* remove backslash */
return NULL; return NULL;
} }

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 */
/**/
156,
/**/ /**/
155, 155,
/**/ /**/