jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.017

3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.017
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.017
3ef2ca
Problem:    ":help !!" does not find the "!!" tag in the help file. (Ben
3ef2ca
	    Fritz)
3ef2ca
Solution:   When reading the start of the tags file do parse lines that are
3ef2ca
	    not header lines.
3ef2ca
Files:	    src/tag.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.016/src/tag.c	2013-06-15 22:26:26.000000000 +0200
3ef2ca
--- src/tag.c	2013-09-05 12:03:38.000000000 +0200
3ef2ca
***************
3ef2ca
*** 1797,1809 ****
3ef2ca
  	     */
3ef2ca
  	    if (state == TS_START)
3ef2ca
  	    {
3ef2ca
! 		/* The header ends when the line sorts below "!_TAG_".
3ef2ca
! 		 * There may be non-header items before the header though,
3ef2ca
! 		 * e.g. "!" itself. When case is folded lower case letters
3ef2ca
! 		 * sort before "_". */
3ef2ca
  		if (STRNCMP(lbuf, "!_TAG_", 6) <= 0
3ef2ca
  				|| (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1])))
3ef2ca
  		{
3ef2ca
  		    /*
3ef2ca
  		     * Read header line.
3ef2ca
  		     */
3ef2ca
--- 1797,1812 ----
3ef2ca
  	     */
3ef2ca
  	    if (state == TS_START)
3ef2ca
  	    {
3ef2ca
! 		/* The header ends when the line sorts below "!_TAG_".  When
3ef2ca
! 		 * case is folded lower case letters sort before "_". */
3ef2ca
  		if (STRNCMP(lbuf, "!_TAG_", 6) <= 0
3ef2ca
  				|| (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1])))
3ef2ca
  		{
3ef2ca
+ 		    if (STRNCMP(lbuf, "!_TAG_", 6) != 0)
3ef2ca
+ 			/* Non-header item before the header, e.g. "!" itself.
3ef2ca
+ 			 */
3ef2ca
+ 			goto parse_line;
3ef2ca
+ 
3ef2ca
  		    /*
3ef2ca
  		     * Read header line.
3ef2ca
  		     */
3ef2ca
***************
3ef2ca
*** 1898,1903 ****
3ef2ca
--- 1901,1907 ----
3ef2ca
  #endif
3ef2ca
  	    }
3ef2ca
  
3ef2ca
+ parse_line:
3ef2ca
  	    /*
3ef2ca
  	     * Figure out where the different strings are in this line.
3ef2ca
  	     * For "normal" tags: Do a quick check if the tag matches.
3ef2ca
*** ../vim-7.4.016/src/version.c	2013-08-30 17:29:10.000000000 +0200
3ef2ca
--- src/version.c	2013-09-05 12:02:01.000000000 +0200
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     17,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
An error has occurred.  Hit any user to continue.
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///