Mercurial > vim
comparison src/edit.c @ 10916:503b28f0a974 v8.0.0347
patch 8.0.0347: when using completion comment leader wont work
commit https://github.com/vim/vim/commit/d099e033703ce0772f152b8df8a763f0b65303ee
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 21 23:00:36 2017 +0100
patch 8.0.0347: when using completion comment leader wont work
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 #1494)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 21 Feb 2017 23:15:04 +0100 |
parents | c68775848f5f |
children | 3b82ab325d59 |
comparison
equal
deleted
inserted
replaced
10915:b8a3d6f54e15 | 10916:503b28f0a974 |
---|---|
5093 int startcol = 0; /* column where searched text starts */ | 5093 int startcol = 0; /* column where searched text starts */ |
5094 colnr_T curs_col; /* cursor column */ | 5094 colnr_T curs_col; /* cursor column */ |
5095 int n; | 5095 int n; |
5096 int save_w_wrow; | 5096 int save_w_wrow; |
5097 int insert_match; | 5097 int insert_match; |
5098 int save_did_ai = did_ai; | |
5098 | 5099 |
5099 compl_direction = ins_compl_key2dir(c); | 5100 compl_direction = ins_compl_key2dir(c); |
5100 insert_match = ins_compl_use_match(c); | 5101 insert_match = ins_compl_use_match(c); |
5101 | 5102 |
5102 if (!compl_started) | 5103 if (!compl_started) |
5376 ? curbuf->b_p_cfu : curbuf->b_p_ofu; | 5377 ? curbuf->b_p_cfu : curbuf->b_p_ofu; |
5377 if (*funcname == NUL) | 5378 if (*funcname == NUL) |
5378 { | 5379 { |
5379 EMSG2(_(e_notset), ctrl_x_mode == CTRL_X_FUNCTION | 5380 EMSG2(_(e_notset), ctrl_x_mode == CTRL_X_FUNCTION |
5380 ? "completefunc" : "omnifunc"); | 5381 ? "completefunc" : "omnifunc"); |
5382 /* restore did_ai, so that adding comment leader works */ | |
5383 did_ai = save_did_ai; | |
5381 return FAIL; | 5384 return FAIL; |
5382 } | 5385 } |
5383 | 5386 |
5384 args[0] = (char_u *)"1"; | 5387 args[0] = (char_u *)"1"; |
5385 args[1] = NULL; | 5388 args[1] = NULL; |