0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.3.130

Problem:    Variable misplaced in #ifdef.
Solution:   Move clipboard_event_time outside of #ifdef.
This commit is contained in:
Bram Moolenaar
2011-02-25 15:15:50 +01:00
parent 128773b21d
commit ede547afcf
2 changed files with 5 additions and 2 deletions

View File

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

View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
130,
/**/ /**/
129, 129,
/**/ /**/