summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-01-27 21:39:05 +0100
committerBram Moolenaar <bram@vim.org>2015-01-27 21:39:05 +0100
commitcd0752ec58254b7e3119b425bef16f1ed46f201f (patch)
treee3306348fedf0bbde58668774e7ad33042465edc
parentf42725f369f7ab0eb4db74d3b10b9d9fb42ef15f (diff)
downloadvim-7-4-607.tar.gz
updated for version 7.4.607v7.4.607v7-4-607
Problem: Compiler warnings for unused variables. Solution: Move them inside #ifdef. (Kazunobu Kuriyama)
-rw-r--r--src/ui.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ui.c b/src/ui.c
index a2d83458..10ae7317 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -73,8 +73,6 @@ ui_write(s, len)
static char_u *ta_str = NULL;
static int ta_off; /* offset for next char to use when ta_str != NULL */
static int ta_len; /* length of ta_str when it's not NULL*/
-static int clipboard_needs_update; /* clipboard needs to be updated */
-static int global_change_count = 0; /* if set, inside a start_global_changes */
void
ui_inchar_undo(s, len)
@@ -564,6 +562,8 @@ clip_copy_selection(clip)
* prevents accessing the clipboard very often which might slow down Vim
* considerably.
*/
+static int global_change_count = 0; /* if set, inside a start_global_changes */
+static int clipboard_needs_update; /* clipboard needs to be updated */
/*
* Save clip_unnamed and reset it.
diff --git a/src/version.c b/src/version.c
index 72d85b61..1c4693f2 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 */
/**/
+ 607,
+/**/
606,
/**/
605,