7.2.124

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.124
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.2.124
  11 Problem:    Typing 'q' at more prompt for ":tselect" output still displays
  12             more lines, causing another more prompt. (Markus Heidelberg)
  13 Solution:   Quit listing tags when 'q' typed.
  14 Files:      src/tag.c
  15
  16
  17 *** ../vim-7.2.123/src/tag.c    Sat Feb 21 22:57:10 2009
  18 --- src/tag.c   Mon Feb 23 00:07:24 2009
  19 ***************
  20 *** 618,624 ****
  21                 taglen_advance(taglen);
  22                 MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
  23
  24 !               for (i = 0; i < num_matches; ++i)
  25                 {
  26                     parse_match(matches[i], &tagp);
  27                     if (!new_tag && (
  28 --- 618,624 ----
  29                 taglen_advance(taglen);
  30                 MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
  31
  32 !               for (i = 0; i < num_matches && !got_int; ++i)
  33                 {
  34                     parse_match(matches[i], &tagp);
  35                     if (!new_tag && (
  36 ***************
  37 *** 655,660 ****
  38 --- 655,662 ----
  39                     }
  40                     if (msg_col > 0)
  41                         msg_putchar('\n');
  42 +                   if (got_int)
  43 +                       break;
  44                     msg_advance(15);
  45
  46                     /* print any extra fields */
  47 ***************
  48 *** 689,694 ****
  49 --- 691,698 ----
  50                                 if (msg_col + ptr2cells(p) >= Columns)
  51                                 {
  52                                     msg_putchar('\n');
  53 +                                   if (got_int)
  54 +                                       break;
  55                                     msg_advance(15);
  56                                 }
  57                                 p = msg_outtrans_one(p, attr);
  58 ***************
  59 *** 704,709 ****
  60 --- 708,715 ----
  61                         if (msg_col > 15)
  62                         {
  63                             msg_putchar('\n');
  64 +                           if (got_int)
  65 +                               break;
  66                             msg_advance(15);
  67                         }
  68                     }
  69 ***************
  70 *** 734,739 ****
  71 --- 740,747 ----
  72                     {
  73                         if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns)
  74                             msg_putchar('\n');
  75 +                       if (got_int)
  76 +                           break;
  77                         msg_advance(15);
  78
  79                         /* skip backslash used for escaping command char */
  80 ***************
  81 *** 760,771 ****
  82                     if (msg_col)
  83                         msg_putchar('\n');
  84                     ui_breakcheck();
  85 -                   if (got_int)
  86 -                   {
  87 -                       got_int = FALSE;        /* only stop the listing */
  88 -                       break;
  89 -                   }
  90                 }
  91                 ask_for_selection = TRUE;
  92             }
  93   #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
  94 --- 768,776 ----
  95                     if (msg_col)
  96                         msg_putchar('\n');
  97                     ui_breakcheck();
  98                 }
  99 +               if (got_int)
 100 +                   got_int = FALSE;    /* only stop the listing */
 101                 ask_for_selection = TRUE;
 102             }
 103   #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
 104 *** ../vim-7.2.123/src/version.c        Sun Feb 22 23:42:08 2009
 105 --- src/version.c       Mon Feb 23 00:51:57 2009
 106 ***************
 107 *** 678,679 ****
 108 --- 678,681 ----
 109   {   /* Add new patch number below this line */
 110 + /**/
 111 +     124,
 112   /**/
 113
 114 --
 115 hundred-and-one symptoms of being an internet addict:
 116 123. You ask the car dealer to install an extra cigarette lighter
 117      on your new car to power your notebook.
 118
 119  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 120 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 121 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 122  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///