summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-12-09 18:26:22 +0000
committerBram Moolenaar <Bram@vim.org>2007-12-09 18:26:22 +0000
commita713933cd116b396821e54dade8dd82770416832 (patch)
treeb78c3902faacf97339506547a66e0c15269012e2
parent11717bb0a1275f1e270396aeb1df92d973d4d068 (diff)
downloadvim-git-a713933cd116b396821e54dade8dd82770416832.tar.gz
updated for version 7.1-173v7.1.173
-rw-r--r--src/regexp.c8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/regexp.c b/src/regexp.c
index 6717d2c73..d61473c9f 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -3810,11 +3810,11 @@ regmatch(scan)
break;
case RE_BOF:
- /* Passing -1 to the getline() function provided for the search
- * should always return NULL if the current line is the first
- * line of the file. */
+ /* We're not at the beginning of the file when below the first
+ * line where we started, not at the start of the line or we
+ * didn't start at the first line of the buffer. */
if (reglnum != 0 || reginput != regline
- || (REG_MULTI && reg_getline((linenr_T)-1) != NULL))
+ || (REG_MULTI && reg_firstlnum > 1))
status = RA_NOMATCH;
break;
diff --git a/src/version.c b/src/version.c
index 1bf84d35b..3310ef21e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 173,
+/**/
172,
/**/
171,