commit 700303e8f75ff5c67ce1bd45b3cc4de84e06c014
author Bram Moolenaar <Bram@vim.org> Sun Jul 11 17:35:50 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jul 11 17:35:50 2010 +0200
tree 898c17b5b6d072ef1d38fce830092d18367effb7
parent 3acfc30409eb8e3721d888f2e7111111057fe937

When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
for "gq". (James Vega)

src/ops.c

diff --git a/src/ops.c b/src/ops.c
index cf83a88..4eef688 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -4475,7 +4475,10 @@
 	redraw_curbuf_later(INVERTED);
 # endif
 
-    (void)fex_format(oap->start.lnum, oap->line_count, NUL);
+    if (fex_format(oap->start.lnum, oap->line_count, NUL) != 0)
+	/* As documented: when 'formatexpr' returns non-zero fall back to
+	 * internal formatting. */
+	op_format(oap, FALSE);
 }
 
     int