To: vim-dev@vim.org Subject: Patch 6.1.312 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.312 Problem: When using ":silent" debugging is also done silently. Solution: Disable silence while at the debug prompt. Files: src/ex_cmds2.c *** ../vim61.311/src/ex_cmds2.c Wed Jan 29 22:08:43 2003 --- src/ex_cmds2.c Mon Jan 27 23:01:33 2003 *************** *** 30,35 **** --- 30,37 ---- int save_State = State; int save_did_emsg = did_emsg; int save_cmd_silent = cmd_silent; + int save_msg_silent = msg_silent; + int save_emsg_silent = emsg_silent; tasave_T typeaheadbuf; # ifdef FEAT_EX_EXTRA int save_ex_normal_busy; *************** *** 60,69 **** settmode(TMODE_RAW); starttermcap(); ! ++RedrawingDisabled; /* don't redisplay the window */ ! ++no_wait_return; /* don't wait for return */ ! did_emsg = FALSE; /* don't use error from debugged stuff */ ! cmd_silent = FALSE; /* display commands */ State = NORMAL; #ifdef FEAT_SNIFF --- 62,73 ---- settmode(TMODE_RAW); starttermcap(); ! ++RedrawingDisabled; /* don't redisplay the window */ ! ++no_wait_return; /* don't wait for return */ ! did_emsg = FALSE; /* don't use error from debugged stuff */ ! cmd_silent = FALSE; /* display commands */ ! msg_silent = FALSE; /* display messages */ ! emsg_silent = FALSE; /* display error messages */ State = NORMAL; #ifdef FEAT_SNIFF *************** *** 71,77 **** #endif if (!debug_did_msg) ! MSG(_("Entering Debug mode. Type \"cont\" to leave.")); if (sourcing_name != NULL) msg(sourcing_name); if (sourcing_lnum != 0) --- 75,81 ---- #endif if (!debug_did_msg) ! MSG(_("Entering Debug mode. Type \"cont\" to continue.")); if (sourcing_name != NULL) msg(sourcing_name); if (sourcing_lnum != 0) *************** *** 196,201 **** --- 200,207 ---- State = save_State; did_emsg = save_did_emsg; cmd_silent = save_cmd_silent; + msg_silent = save_msg_silent; + emsg_silent = save_emsg_silent; /* Only print the message again when typing a command before coming back * here. */ *** ../vim61.311/src/version.c Wed Jan 29 22:08:43 2003 --- src/version.c Thu Jan 30 22:19:31 2003 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 312, /**/ -- From "know your smileys": (X0||) Double hamburger with lettuce and tomato /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///