Merge pull request #1596 from elmart/fix-newline-subst

Fix newline substitution: Adapt to upstream patch.
This commit is contained in:
Justin M. Keyes
2014-12-02 15:15:37 -05:00

View File

@@ -3606,12 +3606,13 @@ void do_sub(exarg_T *eap)
linenr_T joined_lines_count = eap->line2 < curbuf->b_ml.ml_line_count
? eap->line2 - eap->line1 + 2
: eap->line2 - eap->line1 + 1;
if (joined_lines_count >= 2) {
if (joined_lines_count > 1) {
do_join(joined_lines_count, FALSE, TRUE, FALSE, true);
sub_nsubs = joined_lines_count - 1;
sub_nlines = 1;
do_sub_msg(false);
ex_may_print(eap);
}
sub_nlines = sub_nsubs = joined_lines_count - 1;
do_sub_msg(false);
ex_may_print(eap);
return;
}