mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 09:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0040: issue with prompt buffer and hidden buffer (#27071)

Browse Source 
Problem:  Modifying a hidden buffer still interferes with prompt buffer
          mode changes.
Solution: Save and restore b_prompt_insert.
          (zeertzjq)

closes: vim/vim#13875

Modifying hidden buffer still interferes with prompt buffer mode changes

f267847017
This commit is contained in:
zeertzjq
2024-01-18 07:23:48 +08:00
committed by GitHub
parent 780dd88b68
commit 8a07ca6c4b
4 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/autocmd.c
View File

@@ -1302,9 +1302,11 @@ void aucmd_prepbuf(aco_save_T *aco, buf_T *buf)
}
aco->save_curwin_handle = curwin->handle;
aco->save_curbuf = curbuf;
aco->save_prevwin_handle = prevwin == NULL ? 0 : prevwin->handle;
aco->save_State = State;
if (bt_prompt(curbuf)) {
aco->save_prompt_insert = curbuf->b_prompt_insert;
}
if (win != NULL) {
// There is a window for "buf" in the current tab page, make it the
@@ -1417,6 +1419,9 @@ win_found:
curbuf = curwin->w_buffer;
// May need to restore insert mode for a prompt buffer.
entering_window(curwin);
if (bt_prompt(curbuf)) {
curbuf->b_prompt_insert = aco->save_prompt_insert;
}
prevwin = win_find_by_handle(aco->save_prevwin_handle);
vars_clear(&awp->w_vars->dv_hashtab); // free all w: variables

2
src/nvim/autocmd_defs.h
View File

@@ -14,7 +14,6 @@
/// Struct to save values in before executing autocommands for a buffer that is
/// not the current buffer.
typedef struct {
buf_T *save_curbuf; ///< saved curbuf
int use_aucmd_win_idx; ///< index in aucmd_win[] if >= 0
handle_T save_curwin_handle; ///< ID of saved curwin
handle_T new_curwin_handle; ///< ID of new curwin
@@ -23,6 +22,7 @@ typedef struct {
char *globaldir; ///< saved value of globaldir
bool save_VIsual_active; ///< saved VIsual_active
int save_State; ///< saved State
int save_prompt_insert; ///< saved b_prompt_insert
} aco_save_T;
typedef struct {