|
 |
d92e705 |
To: vim_dev@googlegroups.com
|
|
|
d92e705 |
Subject: Patch 7.4.334
|
|
|
d92e705 |
Fcc: outbox
|
|
|
d92e705 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d92e705 |
Mime-Version: 1.0
|
|
|
d92e705 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d92e705 |
Content-Transfer-Encoding: 8bit
|
|
|
d92e705 |
------------
|
|
|
d92e705 |
|
|
|
d92e705 |
Patch 7.4.334 (after 7.4.330)
|
|
|
d92e705 |
Problem: Unitialized variables, causing some problems.
|
|
|
d92e705 |
Solution: Initialize the variables. (Dominique Pelle)
|
|
|
d92e705 |
Files: src/screen.c, src/window.c
|
|
|
d92e705 |
|
|
|
d92e705 |
|
|
|
d92e705 |
*** ../vim-7.4.333/src/screen.c 2014-06-17 23:17:56.489376113 +0200
|
|
|
d92e705 |
--- src/screen.c 2014-06-18 21:16:23.560368846 +0200
|
|
|
d92e705 |
***************
|
|
|
d92e705 |
*** 7363,7369 ****
|
|
|
d92e705 |
match_T *shl; /* points to search_hl or a match */
|
|
|
d92e705 |
linenr_T lnum;
|
|
|
d92e705 |
colnr_T mincol; /* minimal column for a match */
|
|
|
d92e705 |
! matchitem_T *cur; /* to retrieve match postions if any */
|
|
|
d92e705 |
{
|
|
|
d92e705 |
linenr_T l;
|
|
|
d92e705 |
colnr_T matchcol;
|
|
|
d92e705 |
--- 7363,7369 ----
|
|
|
d92e705 |
match_T *shl; /* points to search_hl or a match */
|
|
|
d92e705 |
linenr_T lnum;
|
|
|
d92e705 |
colnr_T mincol; /* minimal column for a match */
|
|
|
d92e705 |
! matchitem_T *cur; /* to retrieve match positions if any */
|
|
|
d92e705 |
{
|
|
|
d92e705 |
linenr_T l;
|
|
|
d92e705 |
colnr_T matchcol;
|
|
|
d92e705 |
***************
|
|
|
d92e705 |
*** 7458,7466 ****
|
|
|
d92e705 |
}
|
|
|
d92e705 |
}
|
|
|
d92e705 |
else if (cur != NULL)
|
|
|
d92e705 |
- {
|
|
|
d92e705 |
nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol);
|
|
|
d92e705 |
! }
|
|
|
d92e705 |
if (nmatched == 0)
|
|
|
d92e705 |
{
|
|
|
d92e705 |
shl->lnum = 0; /* no match found */
|
|
|
d92e705 |
--- 7458,7466 ----
|
|
|
d92e705 |
}
|
|
|
d92e705 |
}
|
|
|
d92e705 |
else if (cur != NULL)
|
|
|
d92e705 |
nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol);
|
|
|
d92e705 |
! else
|
|
|
d92e705 |
! nmatched = 0;
|
|
|
d92e705 |
if (nmatched == 0)
|
|
|
d92e705 |
{
|
|
|
d92e705 |
shl->lnum = 0; /* no match found */
|
|
|
d92e705 |
*** ../vim-7.4.333/src/window.c 2014-06-17 17:48:21.784628008 +0200
|
|
|
d92e705 |
--- src/window.c 2014-06-18 21:12:15.232359452 +0200
|
|
|
d92e705 |
***************
|
|
|
d92e705 |
*** 6809,6815 ****
|
|
|
d92e705 |
}
|
|
|
d92e705 |
|
|
|
d92e705 |
/* Build new match. */
|
|
|
d92e705 |
! m = (matchitem_T *)alloc(sizeof(matchitem_T));
|
|
|
d92e705 |
m->id = id;
|
|
|
d92e705 |
m->priority = prio;
|
|
|
d92e705 |
m->pattern = pat == NULL ? NULL : vim_strsave(pat);
|
|
|
d92e705 |
--- 6809,6815 ----
|
|
|
d92e705 |
}
|
|
|
d92e705 |
|
|
|
d92e705 |
/* Build new match. */
|
|
|
d92e705 |
! m = (matchitem_T *)alloc_clear(sizeof(matchitem_T));
|
|
|
d92e705 |
m->id = id;
|
|
|
d92e705 |
m->priority = prio;
|
|
|
d92e705 |
m->pattern = pat == NULL ? NULL : vim_strsave(pat);
|
|
|
d92e705 |
***************
|
|
|
d92e705 |
*** 6835,6841 ****
|
|
|
d92e705 |
int len = 1;
|
|
|
d92e705 |
list_T *subl;
|
|
|
d92e705 |
listitem_T *subli;
|
|
|
d92e705 |
! int error;
|
|
|
d92e705 |
|
|
|
d92e705 |
if (li == NULL)
|
|
|
d92e705 |
{
|
|
|
d92e705 |
--- 6835,6841 ----
|
|
|
d92e705 |
int len = 1;
|
|
|
d92e705 |
list_T *subl;
|
|
|
d92e705 |
listitem_T *subli;
|
|
|
d92e705 |
! int error = FALSE;
|
|
|
d92e705 |
|
|
|
d92e705 |
if (li == NULL)
|
|
|
d92e705 |
{
|
|
|
d92e705 |
*** ../vim-7.4.333/src/version.c 2014-06-17 23:17:56.493376113 +0200
|
|
|
d92e705 |
--- src/version.c 2014-06-18 21:14:16.516364040 +0200
|
|
|
d92e705 |
***************
|
|
|
d92e705 |
*** 736,737 ****
|
|
|
d92e705 |
--- 736,739 ----
|
|
|
d92e705 |
{ /* Add new patch number below this line */
|
|
|
d92e705 |
+ /**/
|
|
|
d92e705 |
+ 334,
|
|
|
d92e705 |
/**/
|
|
|
d92e705 |
|
|
|
d92e705 |
--
|
|
|
d92e705 |
You were lucky. We lived for three months in a brown paper bag in a
|
|
|
d92e705 |
septic tank. We used to have to get up at six o'clock in the morning,
|
|
|
d92e705 |
clean the bag, eat a crust of stale bread, go to work down mill for
|
|
|
d92e705 |
fourteen hours a day week in-week out. When we got home, our Dad
|
|
|
d92e705 |
would thrash us to sleep with his belt!
|
|
|
d92e705 |
|
|
|
d92e705 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d92e705 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d92e705 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d92e705 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|