Mercurial > vim

diff src/ops.c @ 1563:ed7fefbef738 v7.1.276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-276
author vimboss
date Wed, 12 Mar 2008 16:27:00 +0000
parents d976f4da2a4d
children 149d8b46404c
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -4380,7 +4380,7 @@ op_format(oap, keep_cursor)
     if (keep_cursor)
 	saved_cursor = oap->cursor_start;
 
-    format_lines(oap->line_count);
+    format_lines(oap->line_count, keep_cursor);
 
     /*
      * Leave the cursor at the first non-blank of the last formatted line.
@@ -4495,8 +4495,9 @@ fex_format(lnum, count, c)
  * first line.
  */
     void
-format_lines(line_count)
+format_lines(line_count, avoid_fex)
     linenr_T	line_count;
+    int		avoid_fex;		/* don't use 'formatexpr' */
 {
     int		max_len;
     int		is_not_par;		/* current line not part of parag. */
@@ -4666,7 +4667,7 @@ format_lines(line_count)
 #ifdef FEAT_COMMENTS
 			+ (do_comments ? INSCHAR_DO_COM : 0)
 #endif
-			, second_indent);
+			+ (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent);
 		State = old_State;
 		p_smd = smd_save;
 		second_indent = -1;