updated for version 7.3.130

Problem:    Variable misplaced in #ifdef.
Solution:   Move clipboard_event_time outside of #ifdef.

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index f148ff7ee4cae71f1ab00ebc51b8cb73f2c626a5..5c6e831a750fb6f647cf0f8bec217225f6a331df 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -86,9 +86,10 @@ extern void bonobo_dock_item_set_behavior(BonoboDockItem *dock_item, BonoboDockI
 
 #ifdef HAVE_X11_SUNKEYSYM_H
 # include <X11/Sunkeysym.h>
-static guint32 clipboard_event_time = CurrentTime;
 #endif
 
+static guint32 clipboard_event_time = CurrentTime;
+
 /*
  * Easy-to-use macro for multihead support.
  */
@@ -5419,7 +5420,7 @@ gui_mch_wait_for_chars(long wtime)
        }
 
 #if defined(FEAT_NETBEANS_INTG)
-       /* Process the queued netbeans messages. */
+       /* Process any queued netbeans messages. */
        netbeans_parse_messages();
 #endif
 

diff --git a/src/version.c b/src/version.c
index 938d356561da762e134d842f5afcd61a4ed3680b..153ce012d5bd94059927d017f2c70461428d9755 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    130,
 /**/
     129,
 /**/