diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-10-09 14:48:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-10-09 14:48:30 +0200 |
| commit | 3f47f1611d4825e0a7631e74f1547f0a52e14cec (patch) | |
| tree | 70a6e9477e71cbe824f29ec8a96e0b812b29f446 | |
| parent | d95aa5c5c0f1173e3666ef025fcfd837ce9609dc (diff) | |
| download | vim-3f47f1611d4825e0a7631e74f1547f0a52e14cec.tar.gz | |
Problem: Can't build with MSVC. (Ken Takata)
Solution: Move the assignment after the declarations.
| -rw-r--r-- | src/normal.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/normal.c b/src/normal.c index 8384d6ff..0116d058 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1382,9 +1382,6 @@ do_pending_operator(cap, old_col, gui_yank) 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 */ @@ -1396,6 +1393,10 @@ do_pending_operator(cap, old_col, gui_yank) int include_line_break = FALSE; #endif +#ifdef FEAT_LINEBREAK + curwin->w_p_lbr = FALSE; /* Avoid a problem with unwanted linebreaks in + * block mode. */ +#endif #if defined(FEAT_CLIPBOARD) /* * Yank the visual area into the GUI selection register before we operate diff --git a/src/version.c b/src/version.c index 83887f67..8d1e4a0d 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 469, +/**/ 468, /**/ 467, |