summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-17 23:18:01 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-17 23:18:01 +0200
commitde993ea629c532686c3d888246609d2b0c1880b7 (patch)
treeab29b0b64b29daaf0f8b5de6667b7d387a34f8f4
parent58cbc914eacad98d70eff79292e77ecb24107c8f (diff)
downloadvim-git-de993ea629c532686c3d888246609d2b0c1880b7.tar.gz
updated for version 7.4.333v7.4.333
Problem: Compiler warning for unused function. Solution: Put the function inside the #ifdef.
-rw-r--r--src/screen.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index dd8d9a541..e0fbbb463 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -139,7 +139,7 @@ static void draw_vsep_win __ARGS((win_T *wp, int row));
static void redraw_custom_statusline __ARGS((win_T *wp));
#endif
#ifdef FEAT_SEARCH_EXTRA
-#define SEARCH_HL_PRIORITY 0
+# define SEARCH_HL_PRIORITY 0
static void start_search_hl __ARGS((void));
static void end_search_hl __ARGS((void));
static void init_search_hl __ARGS((win_T *wp));
@@ -7476,7 +7476,6 @@ next_search_hl(win, shl, lnum, mincol, cur)
}
}
}
-#endif
static int
next_search_hl_pos(shl, lnum, posmatch, mincol)
@@ -7533,6 +7532,7 @@ next_search_hl_pos(shl, lnum, posmatch, mincol)
}
return FALSE;
}
+#endif
static void
screen_start_highlight(attr)
diff --git a/src/version.c b/src/version.c
index 0038a45f8..300dedbb0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 333,
+/**/
332,
/**/
331,