To: vim_dev@googlegroups.com Subject: Patch 9.0.1038 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1038 Problem: Function name does not match what it is used for. Solution: Include the modifier in the name. (closes #11679) Files: src/ex_getln.c *** ../vim-9.0.1037/src/ex_getln.c 2022-12-01 12:03:42.263227523 +0000 --- src/ex_getln.c 2022-12-09 11:35:25.124645324 +0000 *************** *** 798,809 **** } /* ! * Handle the backslash key pressed in the command-line mode. CTRL-\ CTRL-N ! * goes to Normal mode, CTRL-\ CTRL-G goes to Insert mode when 'insertmode' is ! * set, CTRL-\ e prompts for an expression. */ static int ! cmdline_handle_backslash_key(int c, int *gotesc) { ++no_mapping; ++allow_keys; --- 798,810 ---- } /* ! * Handle CTRL-\ pressed in Command-line mode: ! * - CTRL-\ CTRL-N goes to Normal mode ! * - CTRL-\ CTRL-G goes to Insert mode when 'insertmode' is set ! * - CTRL-\ e prompts for an expression. */ static int ! cmdline_handle_ctrl_bsl(int c, int *gotesc) { ++no_mapping; ++allow_keys; *************** *** 832,839 **** /* * Replace the command line with the result of an expression. ! * Need to save and restore the current command line, to be ! * able to enter a new one... */ if (ccline.cmdpos == ccline.cmdlen) new_cmdpos = 99999; // keep it at the end --- 833,839 ---- /* * Replace the command line with the result of an expression. ! * This will call getcmdline() recursively in get_expr_register(). */ if (ccline.cmdpos == ccline.cmdlen) new_cmdpos = 99999; // keep it at the end *************** *** 843,851 **** c = get_expr_register(); if (c == '=') { ! // Need to save and restore ccline. And set "textlock" ! // to avoid nasty things like going to another buffer when ! // evaluating an expression. ++textlock; p = get_expr_line(); --textlock; --- 843,850 ---- c = get_expr_register(); if (c == '=') { ! // Evaluate the expression. Set "textlock" to avoid nasty things ! // like going to another buffer. ++textlock; p = get_expr_line(); --textlock; *************** *** 1909,1915 **** // mode when 'insertmode' is set, CTRL-\ e prompts for an expression. if (c == Ctrl_BSL) { ! res = cmdline_handle_backslash_key(c, &gotesc); if (res == CMDLINE_CHANGED) goto cmdline_changed; else if (res == CMDLINE_NOT_CHANGED) --- 1908,1914 ---- // mode when 'insertmode' is set, CTRL-\ e prompts for an expression. if (c == Ctrl_BSL) { ! res = cmdline_handle_ctrl_bsl(c, &gotesc); if (res == CMDLINE_CHANGED) goto cmdline_changed; else if (res == CMDLINE_NOT_CHANGED) *************** *** 1917,1923 **** else if (res == GOTO_NORMAL_MODE) goto returncmd; // back to cmd mode c = Ctrl_BSL; // backslash key not processed by ! // cmdline_handle_backslash_key() } if (c == cedit_key || c == K_CMDWIN) --- 1916,1922 ---- else if (res == GOTO_NORMAL_MODE) goto returncmd; // back to cmd mode c = Ctrl_BSL; // backslash key not processed by ! // cmdline_handle_ctrl_bsl() } if (c == cedit_key || c == K_CMDWIN) *** ../vim-9.0.1037/src/version.c 2022-12-08 22:09:09.843635608 +0000 --- src/version.c 2022-12-09 11:36:15.524881545 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1038, /**/ -- This sentence is not sure that it exists, but if it does, it will certainly consider the possibility that other sentences exist. /// 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 ///