|
 |
71e27bd |
To: vim-dev@vim.org
|
|
|
71e27bd |
Subject: patch 7.1.042
|
|
|
71e27bd |
Fcc: outbox
|
|
|
71e27bd |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
71e27bd |
Mime-Version: 1.0
|
|
|
71e27bd |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
71e27bd |
Content-Transfer-Encoding: 8bit
|
|
|
71e27bd |
------------
|
|
|
71e27bd |
|
|
|
71e27bd |
Patch 7.1.042 (after 7.1.040)
|
|
|
71e27bd |
Problem: Internal error when using matchadd(). (David Larson)
|
|
|
71e27bd |
Solution: Check the third argument to be present before using the fourth
|
|
|
71e27bd |
argument. (Martin Toft)
|
|
|
71e27bd |
Files: src/eval.c
|
|
|
71e27bd |
|
|
|
71e27bd |
|
|
|
71e27bd |
*** ../vim-7.1.041/src/eval.c Thu Jul 26 22:55:11 2007
|
|
|
71e27bd |
--- src/eval.c Fri Jul 27 21:29:39 2007
|
|
|
71e27bd |
***************
|
|
|
71e27bd |
*** 7108,7114 ****
|
|
|
71e27bd |
{"getftype", 1, 1, f_getftype},
|
|
|
71e27bd |
{"getline", 1, 2, f_getline},
|
|
|
71e27bd |
{"getloclist", 1, 1, f_getqflist},
|
|
|
71e27bd |
! {"getmatches", 0, 0, f_getmatches},
|
|
|
71e27bd |
{"getpos", 1, 1, f_getpos},
|
|
|
71e27bd |
{"getqflist", 0, 0, f_getqflist},
|
|
|
71e27bd |
{"getreg", 0, 2, f_getreg},
|
|
|
71e27bd |
--- 7108,7114 ----
|
|
|
71e27bd |
{"getftype", 1, 1, f_getftype},
|
|
|
71e27bd |
{"getline", 1, 2, f_getline},
|
|
|
71e27bd |
{"getloclist", 1, 1, f_getqflist},
|
|
|
71e27bd |
! {"getmatches", 0, 0, f_getmatches},
|
|
|
71e27bd |
{"getpos", 1, 1, f_getpos},
|
|
|
71e27bd |
{"getqflist", 0, 0, f_getqflist},
|
|
|
71e27bd |
{"getreg", 0, 2, f_getreg},
|
|
|
71e27bd |
***************
|
|
|
71e27bd |
*** 12526,12534 ****
|
|
|
71e27bd |
if (grp == NULL || pat == NULL)
|
|
|
71e27bd |
return;
|
|
|
71e27bd |
if (argvars[2].v_type != VAR_UNKNOWN)
|
|
|
71e27bd |
prio = get_tv_number_chk(&argvars[2], &error);
|
|
|
71e27bd |
! if (argvars[3].v_type != VAR_UNKNOWN)
|
|
|
71e27bd |
! id = get_tv_number_chk(&argvars[3], &error);
|
|
|
71e27bd |
if (error == TRUE)
|
|
|
71e27bd |
return;
|
|
|
71e27bd |
if (id >= 1 && id <= 3)
|
|
|
71e27bd |
--- 12526,12536 ----
|
|
|
71e27bd |
if (grp == NULL || pat == NULL)
|
|
|
71e27bd |
return;
|
|
|
71e27bd |
if (argvars[2].v_type != VAR_UNKNOWN)
|
|
|
71e27bd |
+ {
|
|
|
71e27bd |
prio = get_tv_number_chk(&argvars[2], &error);
|
|
|
71e27bd |
! if (argvars[3].v_type != VAR_UNKNOWN)
|
|
|
71e27bd |
! id = get_tv_number_chk(&argvars[3], &error);
|
|
|
71e27bd |
! }
|
|
|
71e27bd |
if (error == TRUE)
|
|
|
71e27bd |
return;
|
|
|
71e27bd |
if (id >= 1 && id <= 3)
|
|
|
71e27bd |
*** ../vim-7.1.041/src/version.c Thu Jul 26 23:10:50 2007
|
|
|
71e27bd |
--- src/version.c Fri Jul 27 21:31:13 2007
|
|
|
71e27bd |
***************
|
|
|
71e27bd |
*** 668,669 ****
|
|
|
71e27bd |
--- 668,671 ----
|
|
|
71e27bd |
{ /* Add new patch number below this line */
|
|
|
71e27bd |
+ /**/
|
|
|
71e27bd |
+ 42,
|
|
|
71e27bd |
/**/
|
|
|
71e27bd |
|
|
|
71e27bd |
--
|
|
|
71e27bd |
The future isn't what it used to be.
|
|
|
71e27bd |
|
|
|
71e27bd |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
71e27bd |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
71e27bd |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
71e27bd |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|