From fdd93e0999034ac9263ce329b7043cf5657fe1e5 Mon Sep 17 00:00:00 2001 From: Yegappan Lakshmanan Date: Sun, 24 Aug 2025 12:19:20 +0200 Subject: [PATCH] runtime(termdebug): Remove load guard closes: #18098 Signed-off-by: Yegappan Lakshmanan Signed-off-by: Christian Brabandt --- .../dist/opt/termdebug/plugin/termdebug.vim | 10 +--------- src/testdir/test_plugin_termdebug.vim | 18 ------------------ 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index 40fb952f7e..e96ec749bd 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -4,7 +4,7 @@ vim9script # Author: Bram Moolenaar # Copyright: Vim license applies, see ":help license" -# Last Change: 2025 Jul 08 +# Last Change: 2025 Aug 24 # Converted to Vim9: Ubaldo Tiberi # WORK IN PROGRESS - The basics works stable, more to come @@ -52,14 +52,6 @@ def Echowarn(msg: string) enddef # Variables to keep their status among multiple instances of Termdebug -# Avoid to source the script twice. -if exists('g:termdebug_loaded') - if DEBUG - Echoerr('Termdebug already loaded.') - endif - finish -endif -g:termdebug_loaded = true g:termdebug_is_running = false diff --git a/src/testdir/test_plugin_termdebug.vim b/src/testdir/test_plugin_termdebug.vim index c078a85113..166f4f8663 100644 --- a/src/testdir/test_plugin_termdebug.vim +++ b/src/testdir/test_plugin_termdebug.vim @@ -597,22 +597,4 @@ function Test_termdebug_config_types() unlet g:termdebug_config endfunction -function Test_termdebug_config_debug() - let s:error_message = '\[termdebug\] Termdebug already loaded' - - " USER mode: No error message shall be displayed - packadd termdebug - call assert_true(execute('messages') !~ s:error_message) - - " DEBUG mode: Error message shall now be displayed - let g:termdebug_config = {} - let g:termdebug_config['debug'] = 1 - packadd termdebug - call assert_true(execute('messages') =~ s:error_message) - - unlet g:termdebug_config - unlet g:termdebug_loaded - " Revert DEBUG mode, by reloading the plugin - source $VIMRUNTIME/pack/dist/opt/termdebug/plugin/termdebug.vim -endfunction " vim: shiftwidth=2 sts=2 expandtab