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 | 4697ae00a77ca443354b9ff3ee943b357aa5b899 (patch) | |
| tree | d63cee22360457efbc37360ab7a16a8964c2fb4f | |
| parent | 9a95bdc52a464df219bd496396632f724bafcfe0 (diff) | |
| download | vim-git-4697ae00a77ca443354b9ff3ee943b357aa5b899.tar.gz | |
updated for version 7.4.469v7.4.469
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 8384d6ffe..0116d058b 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 83887f67e..8d1e4a0dd 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, |