diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-02-25 15:15:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-02-25 15:15:50 +0100 |
| commit | 8ea4e99bab6ae3f9488bd6707a25748890eebef3 (patch) | |
| tree | eca34573869c518dba18d7b807d177dc519d8177 | |
| parent | cce7989544e14503eb9147d564294c195efd0a5a (diff) | |
| download | vim-8ea4e99bab6ae3f9488bd6707a25748890eebef3.tar.gz | |
Problem: Variable misplaced in #ifdef.
Solution: Move clipboard_event_time outside of #ifdef.
| -rw-r--r-- | src/gui_gtk_x11.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index f148ff7e..5c6e831a 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 938d3565..153ce012 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, |