d8ee24c
To: vim-dev@vim.org
d8ee24c
Subject: patch 7.0.204
d8ee24c
Fcc: outbox
d8ee24c
From: Bram Moolenaar <Bram@moolenaar.net>
d8ee24c
Mime-Version: 1.0
d8ee24c
Content-Type: text/plain; charset=ISO-8859-1
d8ee24c
Content-Transfer-Encoding: 8bit
d8ee24c
------------
d8ee24c
d8ee24c
Patch 7.0.204
d8ee24c
Problem:    Cscope: Parsing matches for listing isn't done properly.
d8ee24c
Solution:   Check for line number being found. (Yu Zhao)
d8ee24c
Files:	    src/if_cscope.c
d8ee24c
d8ee24c
d8ee24c
*** ../vim-7.0.203/src/if_cscope.c	Tue Jan 16 15:17:43 2007
d8ee24c
--- src/if_cscope.c	Tue Feb 27 17:56:49 2007
d8ee24c
***************
d8ee24c
*** 1932,1945 ****
d8ee24c
  	if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
d8ee24c
  	    continue;
d8ee24c
  	if ((lno = strtok(NULL, (const char *)"\t")) == NULL)
d8ee24c
! 	{
d8ee24c
! 	    /* if NULL, then no "extra", although in cscope's case, there
d8ee24c
! 	     * should always be "extra".
d8ee24c
! 	     */
d8ee24c
! 	    extra = NULL;
d8ee24c
! 	}
d8ee24c
! 
d8ee24c
! 	extra = lno + strlen(lno) + 1;
d8ee24c
  
d8ee24c
  	lno[strlen(lno)-2] = '\0';  /* ignore ;" at the end */
d8ee24c
  
d8ee24c
--- 1932,1939 ----
d8ee24c
  	if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
d8ee24c
  	    continue;
d8ee24c
  	if ((lno = strtok(NULL, (const char *)"\t")) == NULL)
d8ee24c
! 	    continue;
d8ee24c
! 	extra = strtok(NULL, (const char *)"\t");
d8ee24c
  
d8ee24c
  	lno[strlen(lno)-2] = '\0';  /* ignore ;" at the end */
d8ee24c
  
d8ee24c
*** ../vim-7.0.203/src/version.c	Tue Feb 27 17:25:28 2007
d8ee24c
--- src/version.c	Tue Feb 27 18:03:48 2007
d8ee24c
***************
d8ee24c
*** 668,669 ****
d8ee24c
--- 668,671 ----
d8ee24c
  {   /* Add new patch number below this line */
d8ee24c
+ /**/
d8ee24c
+     204,
d8ee24c
  /**/
d8ee24c
d8ee24c
-- 
d8ee24c
I noticed my daughter's Disney-net password on a sticky note:
d8ee24c
"MickeyMinnieGoofyPluto".  I asked her why it was so long.
d8ee24c
"Because they say it has to have at least four characters."
d8ee24c
d8ee24c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
d8ee24c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
d8ee24c
\\\        download, build and distribute -- http://www.A-A-P.org        ///
d8ee24c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///