To: vim_dev@googlegroups.com Subject: Patch 9.0.0688 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0688 (after 9.0.687) Problem: Debugger does not display the whole command. Solution: Set ea.cmd before checking for a breakpoint. Files: src/ex_docmd.c, src/testdir/test_debugger.vim *** ../vim-9.0.0687/src/ex_docmd.c 2022-10-07 17:26:19.019293893 +0100 --- src/ex_docmd.c 2022-10-07 18:43:25.256445223 +0100 *************** *** 1889,1895 **** --- 1889,1899 ---- } } # endif + #endif + + ea.cmd = cmd; + #ifdef FEAT_EVAL // May go to debug mode. If this happens and the ">quit" debug command is // used, throw an interrupt exception and skip the next command. dbg_check_breakpoint(&ea); *************** *** 1935,1941 **** #endif } - ea.cmd = cmd; if (!may_have_range) ea.line1 = ea.line2 = default_address(&ea); else if (parse_cmd_address(&ea, &errormsg, FALSE) == FAIL) --- 1939,1944 ---- *** ../vim-9.0.0687/src/testdir/test_debugger.vim 2022-09-20 22:01:29.404759229 +0100 --- src/testdir/test_debugger.vim 2022-10-07 18:50:26.471772885 +0100 *************** *** 993,999 **** call RunDbgCmd(buf, 'step', ['line 1: vim9script']) call RunDbgCmd(buf, 'step', ['line 3: def DoAThing(): number']) call RunDbgCmd(buf, 'step', ['line 9: export def File2Function()']) - call RunDbgCmd(buf, 'step', ['line 9: def File2Function()']) call RunDbgCmd(buf, 'step', ['line 13: defcompile']) call RunDbgCmd(buf, 'step', ['line 14: File2Function()']) call RunDbgCmd(buf, 'backtrace', [ --- 993,998 ---- *** ../vim-9.0.0687/src/version.c 2022-10-07 17:26:19.023293895 +0100 --- src/version.c 2022-10-07 18:44:23.836360138 +0100 *************** *** 701,702 **** --- 701,704 ---- { /* Add new patch number below this line */ + /**/ + 688, /**/ -- TALL KNIGHT: We shall say Ni! again to you if you do not appease us. ARTHUR: All right! What do you want? TALL KNIGHT: We want ... a shrubbery! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///