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