aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/edit.c
diff options
context:
space:
mode:
authorShougo Matsushita <Shougo.Matsu@gmail.com>2017-03-04 12:35:40 +0900
committerShougo Matsushita <Shougo.Matsu@gmail.com>2017-03-05 12:02:42 +0900
commitcf0b344df14aa5de16ab0a7081ef20d44360c45e (patch)
tree5b926af1ba3b7a6d7448d2aefc571da64fb23d62 /src/nvim/edit.c
parent4303399c10b7106ccf350e8a419fe3c15b81c8e0 (diff)
downloadrneovim-cf0b344df14aa5de16ab0a7081ef20d44360c45e.tar.gz
rneovim-cf0b344df14aa5de16ab0a7081ef20d44360c45e.tar.bz2
rneovim-cf0b344df14aa5de16ab0a7081ef20d44360c45e.zip
vim-patch:8.0.0347
Problem: When using CTRL-X CTRL-U inside a comment, the use of the comment leader may not work. (Klement) Solution: Save and restore did_ai. (Christian Brabandt, closes vim/vim#1494) https://github.com/vim/vim/commit/d099e033703ce0772f152b8df8a763f0b65303ee
Diffstat (limited to 'src/nvim/edit.c')
-rw-r--r--src/nvim/edit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index ccb4455d03..aa029c38a2 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -4344,6 +4344,7 @@ static int ins_complete(int c, bool enable_pum)
int save_w_wrow;
int save_w_leftcol;
int insert_match;
+ int save_did_ai = did_ai;
compl_direction = ins_compl_key2dir(c);
insert_match = ins_compl_use_match(c);
@@ -4559,6 +4560,8 @@ static int ins_complete(int c, bool enable_pum)
if (*funcname == NUL) {
EMSG2(_(e_notset), ctrl_x_mode == CTRL_X_FUNCTION
? "completefunc" : "omnifunc");
+ // restore did_ai, so that adding comment leader works
+ did_ai = save_did_ai;
return FAIL;
}