diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-26 17:11:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-26 17:11:21 +0200 |
| commit | 5d2ca0402954ff79b73d9c86cc16c8a6454b75a7 (patch) | |
| tree | a6c082cefb2ec34e4c73a4613ddd711f62ecab7f /src/window.c | |
| parent | f4fba6dcd508cb369ffa6916d9cb3fcf3d7ed548 (diff) | |
| download | vim-git-5d2ca0402954ff79b73d9c86cc16c8a6454b75a7.tar.gz | |
patch 7.4.1956v7.4.1956
Problem: When using CTRL-W f and pressing "q" at the ATTENTION dialog the
newly opened window is not closed.
Solution: Close the window and go back to the original one. (Norio Takagi,
Hirohito Higashi)
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index 2dc255467..c3cd7a233 100644 --- a/src/window.c +++ b/src/window.c @@ -475,6 +475,8 @@ wingotofile: ptr = grab_file_name(Prenum1, &lnum); if (ptr != NULL) { + tabpage_T *oldtab = curtab; + win_T *oldwin = curwin; # ifdef FEAT_GUI need_mouse_correct = TRUE; # endif @@ -482,9 +484,15 @@ wingotofile: if (win_split(0, 0) == OK) { RESET_BINDING(curwin); - (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, - ECMD_HIDE, NULL); - if (nchar == 'F' && lnum >= 0) + if (do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, + ECMD_HIDE, NULL) == FAIL) + { + /* Failed to open the file, close the window + * opened for it. */ + win_close(curwin, FALSE); + goto_tabpage_win(oldtab, oldwin); + } + else if (nchar == 'F' && lnum >= 0) { curwin->w_cursor.lnum = lnum; check_cursor_lnum(); |