projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 7fd9e930 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.130 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.130 | |
| 11 | Problem: Variable misplaced in #ifdef. | |
| 12 | Solution: Move clipboard_event_time outside of #ifdef. | |
| 13 | Files: src/gui_gtk_x11.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.129/src/gui_gtk_x11.c 2010-08-15 21:57:31.000000000 +0200 | |
| 17 | --- src/gui_gtk_x11.c 2010-12-04 15:26:41.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 86,94 **** | |
| 20 | ||
| 21 | #ifdef HAVE_X11_SUNKEYSYM_H | |
| 22 | # include <X11/Sunkeysym.h> | |
| 23 | - static guint32 clipboard_event_time = CurrentTime; | |
| 24 | #endif | |
| 25 | ||
| 26 | /* | |
| 27 | * Easy-to-use macro for multihead support. | |
| 28 | */ | |
| 29 | --- 86,95 ---- | |
| 30 | ||
| 31 | #ifdef HAVE_X11_SUNKEYSYM_H | |
| 32 | # include <X11/Sunkeysym.h> | |
| 33 | #endif | |
| 34 | ||
| 35 | + static guint32 clipboard_event_time = CurrentTime; | |
| 36 | + | |
| 37 | /* | |
| 38 | * Easy-to-use macro for multihead support. | |
| 39 | */ | |
| 40 | *************** | |
| 41 | *** 5419,5425 **** | |
| 42 | } | |
| 43 | ||
| 44 | #if defined(FEAT_NETBEANS_INTG) | |
| 45 | ! /* Process the queued netbeans messages. */ | |
| 46 | netbeans_parse_messages(); | |
| 47 | #endif | |
| 48 | ||
| 49 | --- 5420,5426 ---- | |
| 50 | } | |
| 51 | ||
| 52 | #if defined(FEAT_NETBEANS_INTG) | |
| 53 | ! /* Process any queued netbeans messages. */ | |
| 54 | netbeans_parse_messages(); | |
| 55 | #endif | |
| 56 | ||
| 57 | *** ../vim-7.3.129/src/version.c 2011-02-25 15:13:43.000000000 +0100 | |
| 58 | --- src/version.c 2011-02-25 15:15:02.000000000 +0100 | |
| 59 | *************** | |
| 60 | *** 716,717 **** | |
| 61 | --- 716,719 ---- | |
| 62 | { /* Add new patch number below this line */ | |
| 63 | + /**/ | |
| 64 | + 130, | |
| 65 | /**/ | |
| 66 | ||
| 67 | -- | |
| 68 | A vacation is a period of travel during which you find that you | |
| 69 | took twice as many clothes and half as much money as you needed. | |
| 70 | ||
| 71 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 72 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 73 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 74 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |