projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 65bfde4c AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.071 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.071 (extra) | |
| 11 | Problem: Win32: Handling netbeans events while Vim is busy updating the | |
| 12 | screen may cause a crash. | |
| 13 | Solution: Like with GTK, only handle netbeans messages in the main loop. | |
| 14 | (Xavier de Gaye) | |
| 15 | Files: src/gui_w48.c, src/netbeans.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.2.070/src/gui_w48.c Thu Nov 20 17:09:09 2008 | |
| 19 | --- src/gui_w48.c Thu Dec 11 23:47:18 2008 | |
| 20 | *************** | |
| 21 | *** 1937,1942 **** | |
| 22 | --- 1937,1947 ---- | |
| 23 | s_need_activate = FALSE; | |
| 24 | } | |
| 25 | ||
| 26 | + #ifdef FEAT_NETBEANS_INTG | |
| 27 | + /* Process the queued netbeans messages. */ | |
| 28 | + netbeans_parse_messages(); | |
| 29 | + #endif | |
| 30 | + | |
| 31 | /* | |
| 32 | * Don't use gui_mch_update() because then we will spin-lock until a | |
| 33 | * char arrives, instead we use GetMessage() to hang until an | |
| 34 | *** ../vim-7.2.070/src/netbeans.c Fri Nov 28 21:26:50 2008 | |
| 35 | --- src/netbeans.c Sun Nov 30 12:07:00 2008 | |
| 36 | *************** | |
| 37 | *** 769,779 **** | |
| 38 | return; /* don't try to parse it */ | |
| 39 | } | |
| 40 | ||
| 41 | ! #ifdef FEAT_GUI_GTK | |
| 42 | if (gtk_main_level() > 0) | |
| 43 | gtk_main_quit(); | |
| 44 | #else | |
| 45 | ! /* Parse the messages, but avoid recursion. */ | |
| 46 | if (level == 1) | |
| 47 | netbeans_parse_messages(); | |
| 48 | ||
| 49 | --- 769,782 ---- | |
| 50 | return; /* don't try to parse it */ | |
| 51 | } | |
| 52 | ||
| 53 | ! #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) | |
| 54 | ! /* Let the main loop handle messages. */ | |
| 55 | ! # ifdef FEAT_GUI_GTK | |
| 56 | if (gtk_main_level() > 0) | |
| 57 | gtk_main_quit(); | |
| 58 | + # endif | |
| 59 | #else | |
| 60 | ! /* Parse the messages now, but avoid recursion. */ | |
| 61 | if (level == 1) | |
| 62 | netbeans_parse_messages(); | |
| 63 | ||
| 64 | *** ../vim-7.2.070/src/version.c Sun Dec 21 13:02:47 2008 | |
| 65 | --- src/version.c Wed Dec 24 12:18:59 2008 | |
| 66 | *************** | |
| 67 | *** 678,679 **** | |
| 68 | --- 678,681 ---- | |
| 69 | { /* Add new patch number below this line */ | |
| 70 | + /**/ | |
| 71 | + 71, | |
| 72 | /**/ | |
| 73 | ||
| 74 | -- | |
| 75 | No children may attend school with their breath smelling of "wild onions." | |
| 76 | [real standing law in West Virginia, United States of America] | |
| 77 | ||
| 78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 79 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 80 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 81 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |