aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.401

Browse Source 
Problem:    A couple more shadowed variables.
Solution:   Rename the variables.
This commit is contained in:
Bram Moolenaar 2012-01-10 22:31:31 +01:00
parent 70b2a56d5a
commit 309cbc3840
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/netbeans.c
View File

@ -443,7 +443,7 @@ getConnInfo(char *file, char **host, char **port, char **auth)
FILE *fp; FILE *fp;
char_u buf[BUFSIZ]; char_u buf[BUFSIZ];
char_u *lp; char_u *lp;
char_u *nl; char_u *nlp;
#ifdef UNIX #ifdef UNIX
struct stat st; struct stat st;
@ -472,8 +472,8 @@ getConnInfo(char *file, char **host, char **port, char **auth)
/* Read the file. There should be one of each parameter */ /* Read the file. There should be one of each parameter */
while ((lp = (char_u *)fgets((char *)buf, BUFSIZ, fp)) != NULL) while ((lp = (char_u *)fgets((char *)buf, BUFSIZ, fp)) != NULL)
{ {
if ((nl = vim_strchr(lp, '\n')) != NULL) if ((nlp = vim_strchr(lp, '\n')) != NULL)
*nl = 0; /* strip off the trailing newline */ *nlp = 0; /* strip off the trailing newline */
if (STRNCMP(lp, "host=", 5) == 0) if (STRNCMP(lp, "host=", 5) == 0)
{ {
@ -1740,7 +1740,7 @@ nb_do_cmd(
int added = 0; int added = 0;
int oldFire = netbeansFireChanges; int oldFire = netbeansFireChanges;
int old_b_changed; int old_b_changed;
char_u *nl; char_u *nlp;
linenr_T lnum; linenr_T lnum;
linenr_T lnum_start; linenr_T lnum_start;
pos_T *pos; pos_T *pos;
@ -1780,8 +1780,8 @@ nb_do_cmd(
do_update = 1; do_update = 1;
while (*args != NUL) while (*args != NUL)
{ {
nl = vim_strchr(args, '\n'); nlp = vim_strchr(args, '\n');
if (nl == NULL) if (nlp == NULL)
{ {
/* Incomplete line, probably truncated. Next "insert" /* Incomplete line, probably truncated. Next "insert"
* command should append to this one. */ * command should append to this one. */
@ -1789,13 +1789,13 @@ nb_do_cmd(
} }
else else
{ {
len = nl - args; len = nlp - args;
/* /*
* We need to detect EOL style, because the commands * We need to detect EOL style, because the commands
* use a character offset. * use a character offset.
*/ */
if (nl > args && nl[-1] == '\r') if (nlp > args && nlp[-1] == '\r')
{ {
ff_detected = EOL_DOS; ff_detected = EOL_DOS;
--len; --len;
@ -1814,7 +1814,8 @@ nb_do_cmd(
/* Insert halfway a line. For simplicity we assume we /* Insert halfway a line. For simplicity we assume we
* need to append to the line. */ * need to append to the line. */
newline = alloc_check((unsigned)(STRLEN(oldline) + len + 1)); newline = alloc_check(
(unsigned)(STRLEN(oldline) + len + 1));
if (newline != NULL) if (newline != NULL)
{ {
STRCPY(newline, oldline); STRCPY(newline, oldline);
@ -1826,14 +1827,15 @@ nb_do_cmd(
{ {
/* Append a new line. Not that we always do this, /* Append a new line. Not that we always do this,
* also when the text doesn't end in a "\n". */ * also when the text doesn't end in a "\n". */
ml_append((linenr_T)(lnum - 1), args, (colnr_T)(len + 1), FALSE); ml_append((linenr_T)(lnum - 1), args,
(colnr_T)(len + 1), FALSE);
++added; ++added;
} }
if (nl == NULL) if (nlp == NULL)
break; break;
++lnum; ++lnum;
args = nl + 1; args = nlp + 1;
} }
/* Adjust the marks below the inserted lines. */ /* Adjust the marks below the inserted lines. */

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 */
/**/
401,
/**/ /**/
400, 400,
/**/ /**/