|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.556
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.556
|
|
|
22c937 |
Problem: Failed commands in Python interface not handled correctly.
|
|
|
22c937 |
Solution: Restore window and buffer on failure.
|
|
|
22c937 |
Files: src/if_py_both.h
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.555/src/if_py_both.h 2014-08-29 13:49:48.678436915 +0200
|
|
|
22c937 |
--- src/if_py_both.h 2014-09-19 14:21:33.474404353 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 3172,3177 ****
|
|
|
22c937 |
--- 3172,3178 ----
|
|
|
22c937 |
if (switch_win(&save_curwin, &save_curtab, (win_T *)from,
|
|
|
22c937 |
win_find_tabpage((win_T *)from), FALSE) == FAIL)
|
|
|
22c937 |
{
|
|
|
22c937 |
+ restore_win(save_curwin, save_curtab, TRUE);
|
|
|
22c937 |
if (VimTryEnd())
|
|
|
22c937 |
return -1;
|
|
|
22c937 |
PyErr_SET_VIM(N_("problem while switching windows"));
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 4032,4040 ****
|
|
|
22c937 |
win_T *wp;
|
|
|
22c937 |
tabpage_T *tp;
|
|
|
22c937 |
|
|
|
22c937 |
! if (find_win_for_buf(buf, &wp, &tp) == FAIL
|
|
|
22c937 |
! || switch_win(save_curwinp, save_curtabp, wp, tp, TRUE) == FAIL)
|
|
|
22c937 |
switch_buffer(save_curbufp, buf);
|
|
|
22c937 |
}
|
|
|
22c937 |
|
|
|
22c937 |
static void
|
|
|
22c937 |
--- 4033,4045 ----
|
|
|
22c937 |
win_T *wp;
|
|
|
22c937 |
tabpage_T *tp;
|
|
|
22c937 |
|
|
|
22c937 |
! if (find_win_for_buf(buf, &wp, &tp) == FAIL)
|
|
|
22c937 |
switch_buffer(save_curbufp, buf);
|
|
|
22c937 |
+ else if (switch_win(save_curwinp, save_curtabp, wp, tp, TRUE) == FAIL)
|
|
|
22c937 |
+ {
|
|
|
22c937 |
+ restore_win(*save_curwinp, *save_curtabp, TRUE);
|
|
|
22c937 |
+ switch_buffer(save_curbufp, buf);
|
|
|
22c937 |
+ }
|
|
|
22c937 |
}
|
|
|
22c937 |
|
|
|
22c937 |
static void
|
|
|
22c937 |
*** ../vim-7.4.555/src/version.c 2014-12-17 14:42:42.990240206 +0100
|
|
|
22c937 |
--- src/version.c 2014-12-17 14:44:33.304877367 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 743,744 ****
|
|
|
22c937 |
--- 743,746 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 556,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
hundred-and-one symptoms of being an internet addict:
|
|
|
22c937 |
4. Your eyeglasses have a web site burned in on them.
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|