0
0
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:
Bram Moolenaar
2006-10-10 13:49:10 +00:00
parent 6179c61827
commit f3442e7274
2 changed files with 12 additions and 2 deletions

View File

@@ -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);
} }

View File

@@ -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,
/**/ /**/