summaryrefslogtreecommitdiff
path: root/src/normal.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-09 13:24:43 +0200
committerBram Moolenaar <Bram@vim.org>2014-10-09 13:24:43 +0200
commit404406ad6ba4192262caa54cf5d90b664349aa28 (patch)
tree8bbfeeaa9fa04161776a2849abd746d8446390fc /src/normal.c
parent56095e1cebcdf7a4607c147e485f8a2e12578848 (diff)
downloadvim-git-404406ad6ba4192262caa54cf5d90b664349aa28.tar.gz
updated for version 7.4.467v7.4.467
Diffstat (limited to 'src/normal.c')
-rw-r--r--src/normal.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/normal.c b/src/normal.c
index a8d74117c..8384d6ffe 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1380,6 +1380,12 @@ do_pending_operator(cap, old_col, gui_yank)
pos_T old_cursor;
int empty_region_error;
int restart_edit_save;
+#ifdef FEAT_LINEBREAK
+ int lbr_saved = curwin->w_p_lbr;
+
+ curwin->w_p_lbr = FALSE; /* avoid a problem with unwanted linebreaks in
+ * block mode */
+#endif
/* The visual area is remembered for redo */
static int redo_VIsual_mode = NUL; /* 'v', 'V', or Ctrl-V */
@@ -2136,6 +2142,9 @@ do_pending_operator(cap, old_col, gui_yank)
oap->block_mode = FALSE;
clearop(oap);
}
+#ifdef FEAT_LINEBREAK
+ curwin->w_p_lbr = lbr_saved;
+#endif
}
/*