|
 |
1947e7c |
To: vim_dev@googlegroups.com
|
|
|
1947e7c |
Subject: Patch 7.3.129
|
|
|
1947e7c |
Fcc: outbox
|
|
|
1947e7c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1947e7c |
Mime-Version: 1.0
|
|
|
1947e7c |
Content-Type: text/plain; charset=UTF-8
|
|
|
1947e7c |
Content-Transfer-Encoding: 8bit
|
|
|
1947e7c |
------------
|
|
|
1947e7c |
|
|
|
1947e7c |
Patch 7.3.129
|
|
|
1947e7c |
Problem: Using integer like a boolean.
|
|
|
1947e7c |
Solution: Nicer check for integer being non-zero.
|
|
|
1947e7c |
Files: src/tag.c
|
|
|
1947e7c |
|
|
|
1947e7c |
|
|
|
1947e7c |
*** ../vim-7.3.128/src/tag.c 2010-12-17 18:06:00.000000000 +0100
|
|
|
1947e7c |
--- src/tag.c 2010-12-17 17:49:35.000000000 +0100
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 204,210 ****
|
|
|
1947e7c |
else
|
|
|
1947e7c |
{
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
use_tagstack = FALSE;
|
|
|
1947e7c |
else
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
--- 204,210 ----
|
|
|
1947e7c |
else
|
|
|
1947e7c |
{
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
use_tagstack = FALSE;
|
|
|
1947e7c |
else
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 222,228 ****
|
|
|
1947e7c |
))
|
|
|
1947e7c |
{
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
if (ptag_entry.tagname != NULL
|
|
|
1947e7c |
&& STRCMP(ptag_entry.tagname, tag) == 0)
|
|
|
1947e7c |
--- 222,228 ----
|
|
|
1947e7c |
))
|
|
|
1947e7c |
{
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
if (ptag_entry.tagname != NULL
|
|
|
1947e7c |
&& STRCMP(ptag_entry.tagname, tag) == 0)
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 278,284 ****
|
|
|
1947e7c |
{
|
|
|
1947e7c |
if (
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! g_do_tagpreview ? ptag_entry.tagname == NULL :
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
tagstacklen == 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
--- 278,284 ----
|
|
|
1947e7c |
{
|
|
|
1947e7c |
if (
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! g_do_tagpreview != 0 ? ptag_entry.tagname == NULL :
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
tagstacklen == 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 361,367 ****
|
|
|
1947e7c |
)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
cur_match = ptag_entry.cur_match;
|
|
|
1947e7c |
cur_fnum = ptag_entry.cur_fnum;
|
|
|
1947e7c |
--- 361,367 ----
|
|
|
1947e7c |
)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
cur_match = ptag_entry.cur_match;
|
|
|
1947e7c |
cur_fnum = ptag_entry.cur_fnum;
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 399,405 ****
|
|
|
1947e7c |
prevtagstackidx = tagstackidx;
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
cur_match = ptag_entry.cur_match;
|
|
|
1947e7c |
cur_fnum = ptag_entry.cur_fnum;
|
|
|
1947e7c |
--- 399,405 ----
|
|
|
1947e7c |
prevtagstackidx = tagstackidx;
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
cur_match = ptag_entry.cur_match;
|
|
|
1947e7c |
cur_fnum = ptag_entry.cur_fnum;
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 437,443 ****
|
|
|
1947e7c |
}
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
if (type != DT_SELECT && type != DT_JUMP)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
--- 437,443 ----
|
|
|
1947e7c |
}
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
if (type != DT_SELECT && type != DT_JUMP)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 492,498 ****
|
|
|
1947e7c |
if (use_tagstack)
|
|
|
1947e7c |
name = tagstack[tagstackidx].tagname;
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! else if (g_do_tagpreview)
|
|
|
1947e7c |
name = ptag_entry.tagname;
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
else
|
|
|
1947e7c |
--- 492,498 ----
|
|
|
1947e7c |
if (use_tagstack)
|
|
|
1947e7c |
name = tagstack[tagstackidx].tagname;
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! else if (g_do_tagpreview != 0)
|
|
|
1947e7c |
name = ptag_entry.tagname;
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
else
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 620,626 ****
|
|
|
1947e7c |
parse_match(matches[i], &tagp);
|
|
|
1947e7c |
if (!new_tag && (
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! (g_do_tagpreview
|
|
|
1947e7c |
&& i == ptag_entry.cur_match) ||
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
(use_tagstack
|
|
|
1947e7c |
--- 620,626 ----
|
|
|
1947e7c |
parse_match(matches[i], &tagp);
|
|
|
1947e7c |
if (!new_tag && (
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! (g_do_tagpreview != 0
|
|
|
1947e7c |
&& i == ptag_entry.cur_match) ||
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
(use_tagstack
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 962,968 ****
|
|
|
1947e7c |
++tagstackidx;
|
|
|
1947e7c |
}
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! else if (g_do_tagpreview)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
ptag_entry.cur_match = cur_match;
|
|
|
1947e7c |
ptag_entry.cur_fnum = cur_fnum;
|
|
|
1947e7c |
--- 962,968 ----
|
|
|
1947e7c |
++tagstackidx;
|
|
|
1947e7c |
}
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! else if (g_do_tagpreview != 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
ptag_entry.cur_match = cur_match;
|
|
|
1947e7c |
ptag_entry.cur_fnum = cur_fnum;
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 3110,3116 ****
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
postponed_split = 0; /* don't split again below */
|
|
|
1947e7c |
curwin_save = curwin; /* Save current window */
|
|
|
1947e7c |
--- 3110,3116 ----
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
{
|
|
|
1947e7c |
postponed_split = 0; /* don't split again below */
|
|
|
1947e7c |
curwin_save = curwin; /* Save current window */
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 3148,3154 ****
|
|
|
1947e7c |
/* A :ta from a help file will keep the b_help flag set. For ":ptag"
|
|
|
1947e7c |
* we need to use the flag from the window where we came from. */
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview)
|
|
|
1947e7c |
keep_help_flag = curwin_save->w_buffer->b_help;
|
|
|
1947e7c |
else
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
--- 3148,3154 ----
|
|
|
1947e7c |
/* A :ta from a help file will keep the b_help flag set. For ":ptag"
|
|
|
1947e7c |
* we need to use the flag from the window where we came from. */
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0)
|
|
|
1947e7c |
keep_help_flag = curwin_save->w_buffer->b_help;
|
|
|
1947e7c |
else
|
|
|
1947e7c |
#endif
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 3322,3328 ****
|
|
|
1947e7c |
}
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview && curwin != curwin_save && win_valid(curwin_save))
|
|
|
1947e7c |
{
|
|
|
1947e7c |
/* Return cursor to where we were */
|
|
|
1947e7c |
validate_cursor();
|
|
|
1947e7c |
--- 3322,3329 ----
|
|
|
1947e7c |
}
|
|
|
1947e7c |
|
|
|
1947e7c |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1947e7c |
! if (g_do_tagpreview != 0
|
|
|
1947e7c |
! && curwin != curwin_save && win_valid(curwin_save))
|
|
|
1947e7c |
{
|
|
|
1947e7c |
/* Return cursor to where we were */
|
|
|
1947e7c |
validate_cursor();
|
|
|
1947e7c |
*** ../vim-7.3.128/src/version.c 2011-02-25 15:11:17.000000000 +0100
|
|
|
1947e7c |
--- src/version.c 2011-02-25 15:12:25.000000000 +0100
|
|
|
1947e7c |
***************
|
|
|
1947e7c |
*** 716,717 ****
|
|
|
1947e7c |
--- 716,719 ----
|
|
|
1947e7c |
{ /* Add new patch number below this line */
|
|
|
1947e7c |
+ /**/
|
|
|
1947e7c |
+ 129,
|
|
|
1947e7c |
/**/
|
|
|
1947e7c |
|
|
|
1947e7c |
--
|
|
|
1947e7c |
PRINCE: He's come to rescue me, father.
|
|
|
1947e7c |
LAUNCELOT: (embarrassed) Well, let's not jump to conclusions ...
|
|
|
1947e7c |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
1947e7c |
|
|
|
1947e7c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1947e7c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1947e7c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
1947e7c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|