mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
updated for version 7.0-126
This commit is contained in:
12
src/edit.c
12
src/edit.c
@@ -5333,8 +5333,16 @@ insertchar(c, flags, second_indent)
|
|||||||
/* 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. */
|
||||||
#if defined(FEAT_EVAL)
|
#if defined(FEAT_EVAL)
|
||||||
if (*curbuf->b_p_fex == NUL
|
int do_internal = TRUE;
|
||||||
|| fex_format(curwin->w_cursor.lnum, 1L, c) != 0)
|
|
||||||
|
if (*curbuf->b_p_fex != NUL)
|
||||||
|
{
|
||||||
|
do_internal = (fex_format(curwin->w_cursor.lnum, 1L, c) != 0);
|
||||||
|
/* It may be required to save for undo again, e.g. when setline()
|
||||||
|
* was called. */
|
||||||
|
ins_need_undo = TRUE;
|
||||||
|
}
|
||||||
|
if (do_internal)
|
||||||
#endif
|
#endif
|
||||||
internal_format(textwidth, second_indent, flags, c == NUL);
|
internal_format(textwidth, second_indent, flags, c == NUL);
|
||||||
}
|
}
|
||||||
|
@@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
126,
|
||||||
/**/
|
/**/
|
||||||
125,
|
125,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user