To: vim-dev@vim.org Subject: patch 5.4.20 Fcc: outbox From: Bram Moolenaar ------------ Just a small one... Patch 5.4.20 Problem: GTK: When starting gvim, would send escape sequences to the terminal to switch the cursor off and on. Solution: Don't call msg_start() if the GUI is expected to start. Files: src/main.c *** ../vim-5.4/src/main.c Sun Jul 25 22:02:04 1999 --- src/main.c Tue Aug 10 14:00:10 1999 *************** *** 798,804 **** #else # ifdef USE_GUI_X11 /* ! * Check if the GUI can be started. reset gui.starting if it not * Can't do this with GTK, need to fork first. * Don't know about other systems, stay on the safe side and don't check. */ --- 798,804 ---- #else # ifdef USE_GUI_X11 /* ! * Check if the GUI can be started. Reset gui.starting if not. * Can't do this with GTK, need to fork first. * Don't know about other systems, stay on the safe side and don't check. */ *************** *** 910,916 **** firstwin->w_height = Rows - 1; cmdline_row = Rows - 1; ! if (full_screen) msg_start(); /* in case a mapping or error message is printed */ msg_scroll = TRUE; no_wait_return = TRUE; --- 911,926 ---- firstwin->w_height = Rows - 1; cmdline_row = Rows - 1; ! /* ! * Don't call msg_start() if the GUI is expected to start, it switches the ! * cursor off. Only need to avoid it when want_full_screen could not have ! * been reset above. ! */ ! if (full_screen ! #if defined(USE_GUI) && !defined(ALWAYS_USE_GUI) && !defined(USE_GUI_X11) ! && !gui.starting ! #endif ! ) msg_start(); /* in case a mapping or error message is printed */ msg_scroll = TRUE; no_wait_return = TRUE; *** src/version.h~ Mon Aug 9 23:43:19 1999 --- src/version.h Tue Aug 10 13:55:41 1999 *************** *** 19,26 **** #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 19 ! #define VIM_VERSION_PATCHLEVEL_STR "19" /* * VIM_VERSION_NODOT is used for the runtime directory name. --- 19,26 ---- #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 20 ! #define VIM_VERSION_PATCHLEVEL_STR "20" /* * VIM_VERSION_NODOT is used for the runtime directory name. *************** *** 30,35 **** */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.19" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.19 (1999 Aug 9)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.19 (1999 Aug 9, compiled " --- 30,35 ---- */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.20" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.20 (1999 Aug 10)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.20 (1999 Aug 10, compiled " -- hundred-and-one symptoms of being an internet addict: 18. Your wife drapes a blond wig over your monitor to remind you of what she looks like. --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /