IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3838 from Shougo/vim-7.4.658

Browse Source 
vim-patch:7.4.658
This commit is contained in:
Justin M. Keyes 2015-12-13 01:47:34 -05:00
commit f406ae412e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/edit.c
View File

@ -5017,8 +5017,9 @@ insertchar (
int textwidth; int textwidth;
char_u *p; char_u *p;
int fo_ins_blank; int fo_ins_blank;
int force_format = flags & INSCHAR_FORMAT;
textwidth = comp_textwidth(flags & INSCHAR_FORMAT); textwidth = comp_textwidth(force_format);
fo_ins_blank = has_format_option(FO_INS_BLANK); fo_ins_blank = has_format_option(FO_INS_BLANK);
/* /*
@ -5037,7 +5038,7 @@ insertchar (
* before 'textwidth' * before 'textwidth'
*/ */
if (textwidth > 0 if (textwidth > 0
&& ((flags & INSCHAR_FORMAT) && (force_format
|| (!ascii_iswhite(c) || (!ascii_iswhite(c)
&& !((State & REPLACE_FLAG) && !((State & REPLACE_FLAG)
&& !(State & VREPLACE_FLAG) && !(State & VREPLACE_FLAG)
@ -5051,8 +5052,11 @@ insertchar (
/* Format with 'formatexpr' when it's set. Use internal formatting /* Format with 'formatexpr' when it's set. Use internal formatting
* when 'formatexpr' isn't set or it returns non-zero. */ * when 'formatexpr' isn't set or it returns non-zero. */
int do_internal = TRUE; int do_internal = TRUE;
colnr_T virtcol = get_nolist_virtcol()
+ char2cells(c != NUL ? c : gchar_cursor());
if (*curbuf->b_p_fex != NUL && (flags & INSCHAR_NO_FEX) == 0) { if (*curbuf->b_p_fex != NUL && (flags & INSCHAR_NO_FEX) == 0
&& (force_format || virtcol > (colnr_T)textwidth)) {
do_internal = (fex_format(curwin->w_cursor.lnum, 1L, c) != 0); do_internal = (fex_format(curwin->w_cursor.lnum, 1L, c) != 0);
/* It may be required to save for undo again, e.g. when setline() /* It may be required to save for undo again, e.g. when setline()
* was called. */ * was called. */

2
src/nvim/version.c
View File

@ -338,7 +338,7 @@ static int included_patches[] = {
// 661, // 661,
660, 660,
659, 659,
// 658, 658,
// 657 NA // 657 NA
// 656, // 656,
655, 655,