|
 |
9e23aee |
To: vim-dev@vim.org
|
|
|
9e23aee |
Subject: Patch 7.0.051
|
|
|
9e23aee |
Fcc: outbox
|
|
|
9e23aee |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
9e23aee |
Mime-Version: 1.0
|
|
|
9e23aee |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
9e23aee |
Content-Transfer-Encoding: 8bit
|
|
|
9e23aee |
------------
|
|
|
9e23aee |
|
|
|
9e23aee |
Patch 7.0.051 (after 7.0.44)
|
|
|
9e23aee |
Problem: The Perl interface doesn't compile or doesn't work properly.
|
|
|
9e23aee |
Solution: Remove the spaces before #ifdef and avoid an empty line above it.
|
|
|
9e23aee |
Files: src/if_perl.xs
|
|
|
9e23aee |
|
|
|
9e23aee |
|
|
|
9e23aee |
*** ../vim-7.0.050/src/if_perl.xs Tue Aug 8 16:47:38 2006
|
|
|
9e23aee |
--- src/if_perl.xs Fri Aug 11 22:51:01 2006
|
|
|
9e23aee |
***************
|
|
|
9e23aee |
*** 1068,1098 ****
|
|
|
9e23aee |
line = SvPV(ST(i),PL_na);
|
|
|
9e23aee |
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
aco_save_T aco;
|
|
|
9e23aee |
|
|
|
9e23aee |
/* set curwin/curbuf for "vimbuf" and save some things */
|
|
|
9e23aee |
aucmd_prepbuf(&aco, vimbuf);
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
buf_T *save_curbuf = curbuf;
|
|
|
9e23aee |
|
|
|
9e23aee |
curbuf = vimbuf;
|
|
|
9e23aee |
curwin->w_buffer = vimbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
if (u_savesub(lnum) == OK)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
ml_replace(lnum, (char_u *)line, TRUE);
|
|
|
9e23aee |
changed_bytes(lnum, 0);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
!
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
/* restore curwin/curbuf and a few other things */
|
|
|
9e23aee |
aucmd_restbuf(&aco;;
|
|
|
9e23aee |
/* Careful: autocommands may have made "vimbuf" invalid! */
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curwin->w_buffer = save_curbuf;
|
|
|
9e23aee |
curbuf = save_curbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
--- 1068,1097 ----
|
|
|
9e23aee |
line = SvPV(ST(i),PL_na);
|
|
|
9e23aee |
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
aco_save_T aco;
|
|
|
9e23aee |
|
|
|
9e23aee |
/* set curwin/curbuf for "vimbuf" and save some things */
|
|
|
9e23aee |
aucmd_prepbuf(&aco, vimbuf);
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
buf_T *save_curbuf = curbuf;
|
|
|
9e23aee |
|
|
|
9e23aee |
curbuf = vimbuf;
|
|
|
9e23aee |
curwin->w_buffer = vimbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
if (u_savesub(lnum) == OK)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
ml_replace(lnum, (char_u *)line, TRUE);
|
|
|
9e23aee |
changed_bytes(lnum, 0);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
/* restore curwin/curbuf and a few other things */
|
|
|
9e23aee |
aucmd_restbuf(&aco;;
|
|
|
9e23aee |
/* Careful: autocommands may have made "vimbuf" invalid! */
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curwin->w_buffer = save_curbuf;
|
|
|
9e23aee |
curbuf = save_curbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
***************
|
|
|
9e23aee |
*** 1130,1144 ****
|
|
|
9e23aee |
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
buf_T *save_curbuf = curbuf;
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
aco_save_T aco;
|
|
|
9e23aee |
|
|
|
9e23aee |
/* set curwin/curbuf for "vimbuf" and save some things */
|
|
|
9e23aee |
aucmd_prepbuf(&aco, vimbuf);
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curbuf = vimbuf;
|
|
|
9e23aee |
curwin->w_buffer = vimbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
if (u_savedel(lnum, 1) == OK)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
ml_delete(lnum, 0);
|
|
|
9e23aee |
--- 1129,1143 ----
|
|
|
9e23aee |
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
buf_T *save_curbuf = curbuf;
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
aco_save_T aco;
|
|
|
9e23aee |
|
|
|
9e23aee |
/* set curwin/curbuf for "vimbuf" and save some things */
|
|
|
9e23aee |
aucmd_prepbuf(&aco, vimbuf);
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curbuf = vimbuf;
|
|
|
9e23aee |
curwin->w_buffer = vimbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
if (u_savedel(lnum, 1) == OK)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
ml_delete(lnum, 0);
|
|
|
9e23aee |
***************
|
|
|
9e23aee |
*** 1146,1159 ****
|
|
|
9e23aee |
if (save_curbuf == curbuf)
|
|
|
9e23aee |
check_cursor();
|
|
|
9e23aee |
}
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
/* restore curwin/curbuf and a few other things */
|
|
|
9e23aee |
aucmd_restbuf(&aco;;
|
|
|
9e23aee |
/* Careful: autocommands may have made "vimbuf" invalid! */
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curwin->w_buffer = save_curbuf;
|
|
|
9e23aee |
curbuf = save_curbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
update_curbuf(VALID);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
--- 1145,1158 ----
|
|
|
9e23aee |
if (save_curbuf == curbuf)
|
|
|
9e23aee |
check_cursor();
|
|
|
9e23aee |
}
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
/* restore curwin/curbuf and a few other things */
|
|
|
9e23aee |
aucmd_restbuf(&aco;;
|
|
|
9e23aee |
/* Careful: autocommands may have made "vimbuf" invalid! */
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curwin->w_buffer = save_curbuf;
|
|
|
9e23aee |
curbuf = save_curbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
update_curbuf(VALID);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
***************
|
|
|
9e23aee |
*** 1180,1210 ****
|
|
|
9e23aee |
line = SvPV(ST(i),PL_na);
|
|
|
9e23aee |
if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
aco_save_T aco;
|
|
|
9e23aee |
|
|
|
9e23aee |
/* set curwin/curbuf for "vimbuf" and save some things */
|
|
|
9e23aee |
aucmd_prepbuf(&aco, vimbuf);
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
buf_T *save_curbuf = curbuf;
|
|
|
9e23aee |
|
|
|
9e23aee |
curbuf = vimbuf;
|
|
|
9e23aee |
curwin->w_buffer = vimbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
if (u_inssub(lnum + 1) == OK)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
|
|
|
9e23aee |
appended_lines_mark(lnum, 1L);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
!
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
/* restore curwin/curbuf and a few other things */
|
|
|
9e23aee |
aucmd_restbuf(&aco;;
|
|
|
9e23aee |
/* Careful: autocommands may have made "vimbuf" invalid! */
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curwin->w_buffer = save_curbuf;
|
|
|
9e23aee |
curbuf = save_curbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
update_curbuf(VALID);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
--- 1179,1208 ----
|
|
|
9e23aee |
line = SvPV(ST(i),PL_na);
|
|
|
9e23aee |
if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
aco_save_T aco;
|
|
|
9e23aee |
|
|
|
9e23aee |
/* set curwin/curbuf for "vimbuf" and save some things */
|
|
|
9e23aee |
aucmd_prepbuf(&aco, vimbuf);
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
buf_T *save_curbuf = curbuf;
|
|
|
9e23aee |
|
|
|
9e23aee |
curbuf = vimbuf;
|
|
|
9e23aee |
curwin->w_buffer = vimbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
if (u_inssub(lnum + 1) == OK)
|
|
|
9e23aee |
{
|
|
|
9e23aee |
ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
|
|
|
9e23aee |
appended_lines_mark(lnum, 1L);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
! #ifdef FEAT_AUTOCMD
|
|
|
9e23aee |
/* restore curwin/curbuf and a few other things */
|
|
|
9e23aee |
aucmd_restbuf(&aco;;
|
|
|
9e23aee |
/* Careful: autocommands may have made "vimbuf" invalid! */
|
|
|
9e23aee |
! #else
|
|
|
9e23aee |
curwin->w_buffer = save_curbuf;
|
|
|
9e23aee |
curbuf = save_curbuf;
|
|
|
9e23aee |
! #endif
|
|
|
9e23aee |
update_curbuf(VALID);
|
|
|
9e23aee |
}
|
|
|
9e23aee |
}
|
|
|
9e23aee |
*** ../vim-7.0.050/src/version.c Tue Aug 8 21:36:15 2006
|
|
|
9e23aee |
--- src/version.c Fri Aug 11 22:55:25 2006
|
|
|
9e23aee |
***************
|
|
|
9e23aee |
*** 668,669 ****
|
|
|
9e23aee |
--- 668,671 ----
|
|
|
9e23aee |
{ /* Add new patch number below this line */
|
|
|
9e23aee |
+ /**/
|
|
|
9e23aee |
+ 51,
|
|
|
9e23aee |
/**/
|
|
|
9e23aee |
|
|
|
9e23aee |
--
|
|
|
9e23aee |
"A clear conscience is usually the sign of a bad memory."
|
|
|
9e23aee |
-- Steven Wright
|
|
|
9e23aee |
|
|
|
9e23aee |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
9e23aee |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
9e23aee |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
9e23aee |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|