summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-05-21 12:43:56 +0200
committerBram Moolenaar <bram@vim.org>2013-05-21 12:43:56 +0200
commitc7e9a0df5965ccd60ee0c3b80d8417aff1734868 (patch)
tree68a5d1e6bc44ca81f0dbb7679ae6d269439cfcec
parent2fa3d8fe15bac91f09fba2dae05f194a1754102a (diff)
downloadvim-c7e9a0df5965ccd60ee0c3b80d8417aff1734868.tar.gz
updated for version 7.3.983v7.3.983v7-3-983
Problem: Uneccessary temp variable. Solution: Remove the variable.
-rw-r--r--src/regexp_nfa.c10
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 9ae59ae6..ba3a0f49 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2833,7 +2833,6 @@ nfa_regmatch(start, submatch, m)
int old_reglnum = -1;
int reginput_updated = FALSE;
thread_T *t;
- char_u *cc;
char_u *old_reginput = NULL;
char_u *old_regline = NULL;
nfa_state_T *sta;
@@ -2931,7 +2930,6 @@ again:
}
if (c == NUL)
n = 0;
- cc = reginput;
/* swap lists */
thislist = &list[flag];
@@ -3261,12 +3259,12 @@ again:
break;
case NFA_KWORD: /* \k */
- result = vim_iswordp(cc);
+ result = vim_iswordp(reginput);
ADD_POS_NEG_STATE(t->state);
break;
case NFA_SKWORD: /* \K */
- result = !VIM_ISDIGIT(c) && vim_iswordp(cc);
+ result = !VIM_ISDIGIT(c) && vim_iswordp(reginput);
ADD_POS_NEG_STATE(t->state);
break;
@@ -3281,12 +3279,12 @@ again:
break;
case NFA_PRINT: /* \p */
- result = ptr2cells(cc) == 1;
+ result = ptr2cells(reginput) == 1;
ADD_POS_NEG_STATE(t->state);
break;
case NFA_SPRINT: /* \P */
- result = !VIM_ISDIGIT(c) && ptr2cells(cc) == 1;
+ result = !VIM_ISDIGIT(c) && ptr2cells(reginput) == 1;
ADD_POS_NEG_STATE(t->state);
break;
diff --git a/src/version.c b/src/version.c
index a57f685b..2e685dcc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 983,
+/**/
982,
/**/
981,