Mercurial > vim

changeset 2714:464da5b48d27 v7.3.130

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.130 Problem: Variable misplaced in #ifdef. Solution: Move clipboard_event_time outside of #ifdef.
author Bram Moolenaar <bram@vim.org>
date Fri, 25 Feb 2011 15:15:50 +0100
parents d20d37ef86c8
children f38283ce871c
files src/gui_gtk_x11.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -86,8 +86,9 @@ extern void bonobo_dock_item_set_behavio
 
 #ifdef HAVE_X11_SUNKEYSYM_H
 # include <X11/Sunkeysym.h>
+#endif
+
 static guint32 clipboard_event_time = CurrentTime;
-#endif
 
 /*
  * 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
 
--- 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,