1f2971e
To: vim-dev@vim.org
1f2971e
Subject: Patch 7.2.124
1f2971e
Fcc: outbox
1f2971e
From: Bram Moolenaar <Bram@moolenaar.net>
1f2971e
Mime-Version: 1.0
1f2971e
Content-Type: text/plain; charset=ISO-8859-1
1f2971e
Content-Transfer-Encoding: 8bit
1f2971e
------------
1f2971e
1f2971e
Patch 7.2.124
1f2971e
Problem:    Typing 'q' at more prompt for ":tselect" output still displays
1f2971e
            more lines, causing another more prompt. (Markus Heidelberg)
1f2971e
Solution:   Quit listing tags when 'q' typed.
1f2971e
Files:      src/tag.c
1f2971e
1f2971e
1f2971e
*** ../vim-7.2.123/src/tag.c	Sat Feb 21 22:57:10 2009
1f2971e
--- src/tag.c	Mon Feb 23 00:07:24 2009
1f2971e
***************
1f2971e
*** 618,624 ****
1f2971e
  		taglen_advance(taglen);
1f2971e
  		MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
1f2971e
  
1f2971e
! 		for (i = 0; i < num_matches; ++i)
1f2971e
  		{
1f2971e
  		    parse_match(matches[i], &tagp);
1f2971e
  		    if (!new_tag && (
1f2971e
--- 618,624 ----
1f2971e
  		taglen_advance(taglen);
1f2971e
  		MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
1f2971e
  
1f2971e
! 		for (i = 0; i < num_matches && !got_int; ++i)
1f2971e
  		{
1f2971e
  		    parse_match(matches[i], &tagp);
1f2971e
  		    if (!new_tag && (
1f2971e
***************
1f2971e
*** 655,660 ****
1f2971e
--- 655,662 ----
1f2971e
  		    }
1f2971e
  		    if (msg_col > 0)
1f2971e
  			msg_putchar('\n');
1f2971e
+ 		    if (got_int)
1f2971e
+ 			break;
1f2971e
  		    msg_advance(15);
1f2971e
  
1f2971e
  		    /* print any extra fields */
1f2971e
***************
1f2971e
*** 689,694 ****
1f2971e
--- 691,698 ----
1f2971e
  				if (msg_col + ptr2cells(p) >= Columns)
1f2971e
  				{
1f2971e
  				    msg_putchar('\n');
1f2971e
+ 				    if (got_int)
1f2971e
+ 					break;
1f2971e
  				    msg_advance(15);
1f2971e
  				}
1f2971e
  				p = msg_outtrans_one(p, attr);
1f2971e
***************
1f2971e
*** 704,709 ****
1f2971e
--- 708,715 ----
1f2971e
  			if (msg_col > 15)
1f2971e
  			{
1f2971e
  			    msg_putchar('\n');
1f2971e
+ 			    if (got_int)
1f2971e
+ 				break;
1f2971e
  			    msg_advance(15);
1f2971e
  			}
1f2971e
  		    }
1f2971e
***************
1f2971e
*** 734,739 ****
1f2971e
--- 740,747 ----
1f2971e
  		    {
1f2971e
  			if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns)
1f2971e
  			    msg_putchar('\n');
1f2971e
+ 			if (got_int)
1f2971e
+ 			    break;
1f2971e
  			msg_advance(15);
1f2971e
  
1f2971e
  			/* skip backslash used for escaping command char */
1f2971e
***************
1f2971e
*** 760,771 ****
1f2971e
  		    if (msg_col)
1f2971e
  			msg_putchar('\n');
1f2971e
  		    ui_breakcheck();
1f2971e
- 		    if (got_int)
1f2971e
- 		    {
1f2971e
- 			got_int = FALSE;	/* only stop the listing */
1f2971e
- 			break;
1f2971e
- 		    }
1f2971e
  		}
1f2971e
  		ask_for_selection = TRUE;
1f2971e
  	    }
1f2971e
  #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
1f2971e
--- 768,776 ----
1f2971e
  		    if (msg_col)
1f2971e
  			msg_putchar('\n');
1f2971e
  		    ui_breakcheck();
1f2971e
  		}
1f2971e
+ 		if (got_int)
1f2971e
+ 		    got_int = FALSE;	/* only stop the listing */
1f2971e
  		ask_for_selection = TRUE;
1f2971e
  	    }
1f2971e
  #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
1f2971e
*** ../vim-7.2.123/src/version.c	Sun Feb 22 23:42:08 2009
1f2971e
--- src/version.c	Mon Feb 23 00:51:57 2009
1f2971e
***************
1f2971e
*** 678,679 ****
1f2971e
--- 678,681 ----
1f2971e
  {   /* Add new patch number below this line */
1f2971e
+ /**/
1f2971e
+     124,
1f2971e
  /**/
1f2971e
1f2971e
-- 
1f2971e
hundred-and-one symptoms of being an internet addict:
1f2971e
123. You ask the car dealer to install an extra cigarette lighter
1f2971e
     on your new car to power your notebook.
1f2971e
1f2971e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
1f2971e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
1f2971e
\\\        download, build and distribute -- http://www.A-A-P.org        ///
1f2971e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///