diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-12-17 14:46:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-12-17 14:46:09 +0100 |
| commit | ae38d05271f9f25b6ad39b10e5f41d9656a7f1ab (patch) | |
| tree | ff87fe9afb45b457ca3566337234ec12b26bd1f7 | |
| parent | 36ff08479f0398e09298f5742dcdfa0f8e070a32 (diff) | |
| download | vim-git-ae38d05271f9f25b6ad39b10e5f41d9656a7f1ab.tar.gz | |
updated for version 7.4.556v7.4.556
Problem: Failed commands in Python interface not handled correctly.
Solution: Restore window and buffer on failure.
| -rw-r--r-- | src/if_py_both.h | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 5044afbef..206d2987a 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -3172,6 +3172,7 @@ set_option_value_for( if (switch_win(&save_curwin, &save_curtab, (win_T *)from, win_find_tabpage((win_T *)from), FALSE) == FAIL) { + restore_win(save_curwin, save_curtab, TRUE); if (VimTryEnd()) return -1; PyErr_SET_VIM(N_("problem while switching windows")); @@ -4032,9 +4033,13 @@ switch_to_win_for_buf( win_T *wp; tabpage_T *tp; - if (find_win_for_buf(buf, &wp, &tp) == FAIL - || switch_win(save_curwinp, save_curtabp, wp, tp, TRUE) == FAIL) + if (find_win_for_buf(buf, &wp, &tp) == FAIL) switch_buffer(save_curbufp, buf); + else if (switch_win(save_curwinp, save_curtabp, wp, tp, TRUE) == FAIL) + { + restore_win(*save_curwinp, *save_curtabp, TRUE); + switch_buffer(save_curbufp, buf); + } } static void diff --git a/src/version.c b/src/version.c index 0c8b39a0e..017bff6d5 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 556, +/**/ 555, /**/ 554, |