To: vim-dev@vim.org Subject: patch 5.5.059 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.5.059 Problem: GTK GUI: When $term is invalid, using "gvim" gives an error message, even though $term isn't really used. (Robbins) Solution: When the GUI is about to start, skip the error messages for a wrong $term. Files: src/term.c *** ../vim-5.5.58/src/term.c Wed Sep 22 10:06:29 1999 --- src/term.c Mon Dec 6 19:33:45 1999 *************** *** 1470,1475 **** --- 1470,1484 ---- break; #endif + #ifdef USE_GUI_GTK + /* + * Skip the error message when the GUI is about to start. Can + * happen when using GTK version of gvim when $term is + * invalid. + */ + if (!gui.starting) + { + #endif mch_errmsg("\r\n"); if (error_msg != NULL) { *************** *** 1493,1498 **** --- 1502,1510 ---- mch_errmsg("\r\n"); } } + #ifdef USE_GUI_GTK + } + #endif /* when user typed :set term=xxx, quit here */ if (starting != NO_SCREEN) { *************** *** 1501,1514 **** return FAIL; } term = DEFAULT_TERM; mch_errmsg("defaulting to '"); mch_errmsg((char *)term); mch_errmsg("'\r\n"); screen_start(); /* don't know where cursor is now */ out_flush(); ui_delay(2000L, TRUE); set_string_option_direct((char_u *)"term", -1, term, TRUE); ! mch_display_error(); } out_flush(); #ifdef HAVE_TGETENT --- 1513,1536 ---- return FAIL; } term = DEFAULT_TERM; + #ifdef USE_GUI_GTK + if (!gui.starting) + { + #endif mch_errmsg("defaulting to '"); mch_errmsg((char *)term); mch_errmsg("'\r\n"); screen_start(); /* don't know where cursor is now */ out_flush(); ui_delay(2000L, TRUE); + #ifdef USE_GUI_GTK + } + #endif set_string_option_direct((char_u *)"term", -1, term, TRUE); ! #ifdef USE_GUI_GTK ! if (!gui.starting) ! #endif ! mch_display_error(); } out_flush(); #ifdef HAVE_TGETENT *** ../vim-5.5.58/src/version.c Mon Dec 6 19:39:24 1999 --- src/version.c Mon Dec 6 19:39:03 1999 *************** *** 420,420 **** --- 420,421 ---- { /* Add new patch number below this line */ + 59, -- ARTHUR: This new learning amazes me, Sir Bedevere. Explain again how sheep's bladders may be employed to prevent earthquakes. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /