# HG changeset patch # User Bram Moolenaar # Date 1672665305 -3600 # Node ID 394967126db9d5f91886ea41cc0a9850419c7e9d # Parent 209965683b340b89d6ad9f0afc9a1501f62249fd patch 9.0.1130: unexpected output when autoloading a script Commit: https://github.com/vim/vim/commit/39c82ea6563f8467b8d36f0ecb8ba93a0685c280 Author: Bram Moolenaar Date: Mon Jan 2 13:08:01 2023 +0000 patch 9.0.1130: unexpected output when autoloading a script Problem: Unexpected output when autoloading a script for an interactive operation. Solution: Reset "KeyTyped" while loading a script and when handling a nested function. (closes #11773) diff --git a/src/scriptfile.c b/src/scriptfile.c --- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -1334,10 +1334,10 @@ errret: * When "ret_sid" is not NULL and we loaded the script before, don't load it * again. * - * The 'eap' argument is used when sourcing lines from a buffer instead of a + * The "eap" argument is used when sourcing lines from a buffer instead of a * file. * - * If 'clearvars' is TRUE, then for scripts which are loaded more than + * If "clearvars" is TRUE, then for scripts which are loaded more than * once, clear all the functions and variables previously defined in that * script. * @@ -1538,6 +1538,7 @@ do_source_ext( current_sctx.sc_version = SCRIPT_VERSION_VIM9; else current_sctx.sc_version = 1; // default script version + current_sctx.sc_lnum = 0; #ifdef FEAT_EVAL # ifdef FEAT_PROFILE @@ -1549,7 +1550,10 @@ do_source_ext( // Also starts profiling timer for nested script. save_funccal(&funccalp_entry); - current_sctx.sc_lnum = 0; + // Reset "KeyTyped" to avoid some commands thinking they are invoked + // interactively. E.g. defining a function would output indent. + int save_KeyTyped = KeyTyped; + KeyTyped = FALSE; // Check if this script was sourced before to find its SID. // Always use a new sequence number. @@ -1765,6 +1769,7 @@ almosttheend: # endif #endif current_sctx = save_current_sctx; + KeyTyped = save_KeyTyped; if (cookie.fp != NULL) fclose(cookie.fp); diff --git a/src/testdir/dumps/Test_keytyped_in_nested_func.dump b/src/testdir/dumps/Test_keytyped_in_nested_func.dump new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_keytyped_in_nested_func.dump @@ -0,0 +1,6 @@ +| +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|:+0#0000000&|"> @72 diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 3840d1144f93cc80208496d1b689c34611db0f37..be07aec04a4b6279b9a113692366306b10e04714 GIT binary patch literal 103711 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 F{})t;J`?}| diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1130, +/**/ 1129, /**/ 1128, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -987,7 +987,14 @@ compile_nested_function(exarg_T *eap, cc goto theend; } + // Make sure "KeyTyped" is not set, it may cause indent to be written. + int save_KeyTyped = KeyTyped; + KeyTyped = FALSE; + ufunc = define_function(eap, lambda_name, lines_to_free, FALSE); + + KeyTyped = save_KeyTyped; + if (ufunc == NULL) { r = eap->skip ? OK : FAIL;