summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index f148ff7ee..5c6e831a7 100644
--- 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 938d35656..153ce012d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 130,
+/**/
129,
/**/
128,