Karsten Hopp c11282
To: vim_dev@googlegroups.com
Karsten Hopp c11282
Subject: Patch 7.4.105
Karsten Hopp c11282
Fcc: outbox
Karsten Hopp c11282
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp c11282
Mime-Version: 1.0
Karsten Hopp c11282
Content-Type: text/plain; charset=UTF-8
Karsten Hopp c11282
Content-Transfer-Encoding: 8bit
Karsten Hopp c11282
------------
Karsten Hopp c11282
Karsten Hopp c11282
Patch 7.4.105
Karsten Hopp c11282
Problem:    Completing a tag pattern may give an error for invalid pattern.
Karsten Hopp c11282
Solution:   Suppress the error, just return no matches.
Karsten Hopp c11282
Files:	    src/tag.c
Karsten Hopp c11282
Karsten Hopp c11282
Karsten Hopp c11282
*** ../vim-7.4.104/src/tag.c	2013-11-08 04:30:06.000000000 +0100
Karsten Hopp c11282
--- src/tag.c	2013-11-28 14:27:38.000000000 +0100
Karsten Hopp c11282
***************
Karsten Hopp c11282
*** 1326,1331 ****
Karsten Hopp c11282
--- 1326,1332 ----
Karsten Hopp c11282
      int		match_no_ic = 0;/* matches with rm_ic == FALSE */
Karsten Hopp c11282
      int		match_re;	/* match with regexp */
Karsten Hopp c11282
      int		matchoff = 0;
Karsten Hopp c11282
+     int		save_emsg_off;
Karsten Hopp c11282
  
Karsten Hopp c11282
  #ifdef FEAT_EMACS_TAGS
Karsten Hopp c11282
      /*
Karsten Hopp c11282
***************
Karsten Hopp c11282
*** 1442,1448 ****
Karsten Hopp c11282
--- 1443,1452 ----
Karsten Hopp c11282
      if (p_tl != 0 && orgpat.len > p_tl)		/* adjust for 'taglength' */
Karsten Hopp c11282
  	orgpat.len = p_tl;
Karsten Hopp c11282
  
Karsten Hopp c11282
+     save_emsg_off = emsg_off;
Karsten Hopp c11282
+     emsg_off = TRUE;  /* don't want error for invalid RE here */
Karsten Hopp c11282
      prepare_pats(&orgpat, has_re);
Karsten Hopp c11282
+     emsg_off = save_emsg_off;
Karsten Hopp c11282
      if (has_re && orgpat.regmatch.regprog == NULL)
Karsten Hopp c11282
  	goto findtag_end;
Karsten Hopp c11282
  
Karsten Hopp c11282
*** ../vim-7.4.104/src/version.c	2013-11-28 14:20:11.000000000 +0100
Karsten Hopp c11282
--- src/version.c	2013-11-28 14:30:35.000000000 +0100
Karsten Hopp c11282
***************
Karsten Hopp c11282
*** 740,741 ****
Karsten Hopp c11282
--- 740,743 ----
Karsten Hopp c11282
  {   /* Add new patch number below this line */
Karsten Hopp c11282
+ /**/
Karsten Hopp c11282
+     105,
Karsten Hopp c11282
  /**/
Karsten Hopp c11282
Karsten Hopp c11282
-- 
Karsten Hopp c11282
The goal of science is to build better mousetraps.
Karsten Hopp c11282
The goal of nature is to build better mice.
Karsten Hopp c11282
Karsten Hopp c11282
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp c11282
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp c11282
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp c11282
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///