summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-22 23:54:59 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-22 23:54:59 +0000
commitf08fa44a1a33009dfdc26107a5c0923e07e8d288 (patch)
tree6be0d6fff1753ea94c20ef1960a3c8f1e60125c8
parentfa47a9218dc4d0913200b4f8225cbfde1f2fe13b (diff)
downloadvim-git-f08fa44a1a33009dfdc26107a5c0923e07e8d288.tar.gz
updated for version 7.2-124v7.2.124
-rw-r--r--src/tag.c17
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 6 deletions
diff --git a/src/tag.c b/src/tag.c
index a98c6cb88..391b10687 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -618,7 +618,7 @@ do_tag(tag, type, count, forceit, verbose)
taglen_advance(taglen);
MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
- for (i = 0; i < num_matches; ++i)
+ for (i = 0; i < num_matches && !got_int; ++i)
{
parse_match(matches[i], &tagp);
if (!new_tag && (
@@ -655,6 +655,8 @@ do_tag(tag, type, count, forceit, verbose)
}
if (msg_col > 0)
msg_putchar('\n');
+ if (got_int)
+ break;
msg_advance(15);
/* print any extra fields */
@@ -689,6 +691,8 @@ do_tag(tag, type, count, forceit, verbose)
if (msg_col + ptr2cells(p) >= Columns)
{
msg_putchar('\n');
+ if (got_int)
+ break;
msg_advance(15);
}
p = msg_outtrans_one(p, attr);
@@ -704,6 +708,8 @@ do_tag(tag, type, count, forceit, verbose)
if (msg_col > 15)
{
msg_putchar('\n');
+ if (got_int)
+ break;
msg_advance(15);
}
}
@@ -734,6 +740,8 @@ do_tag(tag, type, count, forceit, verbose)
{
if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns)
msg_putchar('\n');
+ if (got_int)
+ break;
msg_advance(15);
/* skip backslash used for escaping command char */
@@ -760,12 +768,9 @@ do_tag(tag, type, count, forceit, verbose)
if (msg_col)
msg_putchar('\n');
ui_breakcheck();
- if (got_int)
- {
- got_int = FALSE; /* only stop the listing */
- break;
- }
}
+ if (got_int)
+ got_int = FALSE; /* only stop the listing */
ask_for_selection = TRUE;
}
#if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
diff --git a/src/version.c b/src/version.c
index 5d775b4cb..b56d5df15 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 124,
+/**/
123,
/**/
122,