summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-03-18 15:28:08 +0000
committerBram Moolenaar <Bram@vim.org>2009-03-18 15:28:08 +0000
commit1b636fa0e8206aa5688b5b4f035b38a560dce2f0 (patch)
tree5c6b3270aa35d3d57f6f5408b51ad1b5f6a057e7
parent496c5267dfcc66576c0c44537ab591a8d8e0752e (diff)
downloadvim-git-1b636fa0e8206aa5688b5b4f035b38a560dce2f0.tar.gz
updated for version 7.2-147v7.2.147
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index d2785c46c..0c60bc0ac 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4665,7 +4665,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
--n_skip;
/* Only advance the "vcol" when after the 'number' column. */
- if (draw_state >= WL_SBR
+ if (draw_state > WL_NR
#ifdef FEAT_DIFF
&& filler_todo <= 0
#endif
diff --git a/src/version.c b/src/version.c
index 415329a1a..e37682237 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 147,
+/**/
146,
/**/
145,