projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5634d1d6 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.059 | |
| 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.059 | |
| 11 | Problem: Netbeans: Problem with recursively handling messages for Athena | |
| 12 | and Motif. | |
| 13 | Solution: Call netbeans_parse_messages() in the main loop, like it's done | |
| 14 | for GTK. (Xavier de Gaye) | |
| 15 | Files: src/gui_x11.c, src/netbeans.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.058/src/gui_x11.c 2010-08-15 21:57:25.000000000 +0200 | |
| 19 | --- src/gui_x11.c 2010-11-16 14:53:18.000000000 +0100 | |
| 20 | *************** | |
| 21 | *** 2895,2900 **** | |
| 22 | --- 2895,2905 ---- | |
| 23 | focus = gui.in_focus; | |
| 24 | } | |
| 25 | ||
| 26 | + #if defined(FEAT_NETBEANS_INTG) | |
| 27 | + /* Process any 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 XtAppProcessEvent() to hang until an | |
| 34 | *** ../vim-7.3.058/src/netbeans.c 2010-09-30 21:03:13.000000000 +0200 | |
| 35 | --- src/netbeans.c 2010-11-16 14:52:55.000000000 +0100 | |
| 36 | *************** | |
| 37 | *** 726,734 **** | |
| 38 | static char_u *buf = NULL; | |
| 39 | int len = 0; | |
| 40 | int readlen = 0; | |
| 41 | - #if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32) | |
| 42 | - static int level = 0; | |
| 43 | - #endif | |
| 44 | #ifdef HAVE_SELECT | |
| 45 | struct timeval tval; | |
| 46 | fd_set rfds; | |
| 47 | --- 726,731 ---- | |
| 48 | *************** | |
| 49 | *** 744,756 **** | |
| 50 | return; | |
| 51 | } | |
| 52 | ||
| 53 | - #if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32) | |
| 54 | - /* recursion guard; this will be called from the X event loop at unknown | |
| 55 | - * moments */ | |
| 56 | - if (NB_HAS_GUI) | |
| 57 | - ++level; | |
| 58 | - #endif | |
| 59 | - | |
| 60 | /* Allocate a buffer to read into. */ | |
| 61 | if (buf == NULL) | |
| 62 | { | |
| 63 | --- 741,746 ---- | |
| 64 | *************** | |
| 65 | *** 803,823 **** | |
| 66 | return; /* don't try to parse it */ | |
| 67 | } | |
| 68 | ||
| 69 | ! #if defined(NB_HAS_GUI) && !defined(FEAT_GUI_W32) | |
| 70 | ! /* Let the main loop handle messages. */ | |
| 71 | ! if (NB_HAS_GUI) | |
| 72 | ! { | |
| 73 | ! # ifdef FEAT_GUI_GTK | |
| 74 | ! if (gtk_main_level() > 0) | |
| 75 | ! gtk_main_quit(); | |
| 76 | ! # else | |
| 77 | ! /* Parse the messages now, but avoid recursion. */ | |
| 78 | ! if (level == 1) | |
| 79 | ! netbeans_parse_messages(); | |
| 80 | ! | |
| 81 | ! --level; | |
| 82 | ! # endif | |
| 83 | ! } | |
| 84 | #endif | |
| 85 | } | |
| 86 | ||
| 87 | --- 793,801 ---- | |
| 88 | return; /* don't try to parse it */ | |
| 89 | } | |
| 90 | ||
| 91 | ! #if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK) | |
| 92 | ! if (NB_HAS_GUI && gtk_main_level() > 0) | |
| 93 | ! gtk_main_quit(); | |
| 94 | #endif | |
| 95 | } | |
| 96 | ||
| 97 | *** ../vim-7.3.058/src/version.c 2010-11-16 14:46:14.000000000 +0100 | |
| 98 | --- src/version.c 2010-11-16 14:50:57.000000000 +0100 | |
| 99 | *************** | |
| 100 | *** 716,717 **** | |
| 101 | --- 716,719 ---- | |
| 102 | { /* Add new patch number below this line */ | |
| 103 | + /**/ | |
| 104 | + 59, | |
| 105 | /**/ | |
| 106 | ||
| 107 | ||
| 108 | -- | |
| 109 | ARTHUR: If you do not open these doors, we will take this castle by force ... | |
| 110 | [A bucket of slops land on ARTHUR. He tries to retain his dignity.] | |
| 111 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 112 | ||
| 113 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 114 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 115 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 116 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |