updated for version 7.2-124

diff --git a/src/tag.c b/src/tag.c
index a98c6cb881ae34d29b419a334c4bdd357795fea9..391b106877aed6bef3c2474c14707ef4a3f19660 100644 (file)
--- 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 5d775b4cbfb70d35a9120a11cc98ca0cf3d65f74..b56d5df1547b791d79a061b5c082a63f465d0df7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    124,
 /**/
     123,
 /**/