Mercurial > vim

comparison src/gui.c @ 2209:d0ddf7ba1630 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Included the patch to support netbeans in a terminal.
author Bram Moolenaar <bram@vim.org>
date Sat, 22 May 2010 18:28:27 +0200
parents 495995b9ce7d
children 8c6a66e2b3cc
comparison
equal deleted inserted replaced
2208:495995b9ce7d 2209:d0ddf7ba1630
591 # endif 591 # endif
592 if (!p_beval) 592 if (!p_beval)
593 gui_mch_disable_beval_area(balloonEval); 593 gui_mch_disable_beval_area(balloonEval);
594 #endif 594 #endif
595 595
596 #ifdef FEAT_NETBEANS_INTG
597 if (starting == 0 && usingNetbeans)
598 /* Tell the client that it can start sending commands. */
599 netbeans_startup_done();
600 #endif
601 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) 596 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
602 if (!im_xim_isvalid_imactivate()) 597 if (!im_xim_isvalid_imactivate())
603 EMSG(_("E599: Value of 'imactivatekey' is invalid")); 598 EMSG(_("E599: Value of 'imactivatekey' is invalid"));
604 #endif 599 #endif
605 /* When 'cmdheight' was set during startup it may not have taken 600 /* When 'cmdheight' was set during startup it may not have taken
2365 2360
2366 #ifdef FEAT_SIGN_ICONS 2361 #ifdef FEAT_SIGN_ICONS
2367 if (draw_sign) 2362 if (draw_sign)
2368 /* Draw the sign on top of the spaces. */ 2363 /* Draw the sign on top of the spaces. */
2369 gui_mch_drawsign(gui.row, col, gui.highlight_mask); 2364 gui_mch_drawsign(gui.row, col, gui.highlight_mask);
2370 # ifdef FEAT_NETBEANS_INTG 2365 # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_MOTIF) \
2366 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
2371 if (multi_sign) 2367 if (multi_sign)
2372 netbeans_draw_multisign_indicator(gui.row); 2368 netbeans_draw_multisign_indicator(gui.row);
2373 # endif 2369 # endif
2374 #endif 2370 #endif
2375 2371
4782 { 4778 {
4783 /* Clear the command. Needed for when forking+exiting, to avoid part 4779 /* Clear the command. Needed for when forking+exiting, to avoid part
4784 * of the argument ending up after the shell prompt. */ 4780 * of the argument ending up after the shell prompt. */
4785 msg_clr_eos_force(); 4781 msg_clr_eos_force();
4786 gui_start(); 4782 gui_start();
4783 #ifdef FEAT_NETBEANS_INTG
4784 if (usingNetbeans)
4785 netbeans_gui_register();
4786 #endif
4787 } 4787 }
4788 if (!ends_excmd(*eap->arg)) 4788 if (!ends_excmd(*eap->arg))
4789 ex_next(eap); 4789 ex_next(eap);
4790 } 4790 }
4791 4791