From ef38f54fd9b3270395d77d9b71a8242e8ee5a369 Mon Sep 17 00:00:00 2001 From: Joachim Ansorg Date: Wed, 6 Dec 2023 11:26:07 +0100 Subject: [PATCH] bashsupport-pro: Disable bashdb prompt's readline integration because it may break with a custom inputrc mapping of "Control-J". --- lib/processor.sh | 2 +- test/data/bug-loc.cmd | 1 + test/data/bug-loc.right | 3 +++ test/data/misc-output-41.right | 4 ++-- test/data/setshow.right | 3 +-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/processor.sh b/lib/processor.sh index 98f48c8b..9ac1cb3f 100644 --- a/lib/processor.sh +++ b/lib/processor.sh @@ -40,7 +40,7 @@ typeset _Dbg_space=' ' # Should we allow editing of debugger commands? # The value should either be '-e' or ''. And if it is # on, the edit style indicates what style edit keystrokes. -typeset _Dbg_edit='-e' +typeset _Dbg_edit='' # BashSupport Pro: removed '-e' to disable readline support because it may break with custom inputrc settings typeset _Dbg_edit_style='emacs' # or vi set -o $_Dbg_edit_style diff --git a/test/data/bug-loc.cmd b/test/data/bug-loc.cmd index 31c1d00a..c094414a 100644 --- a/test/data/bug-loc.cmd +++ b/test/data/bug-loc.cmd @@ -1,4 +1,5 @@ set trace-commands on +set editing emacs # Test to see that we read in files that mentioned in breakpoints # but we don't step into. step diff --git a/test/data/bug-loc.right b/test/data/bug-loc.right index 55771db4..bc00f82f 100644 --- a/test/data/bug-loc.right +++ b/test/data/bug-loc.right @@ -1,5 +1,8 @@ (bug-loc.sh:5): 5: dirname=${BASH_SOURCE%/*} # equivalent to dirname($0) ++set editing emacs +Editing of command lines as they are typed is on. + Edit style is emacs. +# Test to see that we read in files that mentioned in breakpoints +# but we don't step into. +step diff --git a/test/data/misc-output-41.right b/test/data/misc-output-41.right index 0cbafad3..0c94db89 100644 --- a/test/data/misc-output-41.right +++ b/test/data/misc-output-41.right @@ -86,8 +86,8 @@ set autolist -- Run list command is off. set basename -- Set short filenames (the basename) in debug output is on. set debug -- Set debugging the debugger is off. set different -- Set to stop at a different line is different -set editing -- Set editing of command lines as they are typed is on. -set highlight -- Set syntax highlighting of source listings is on. +set editing -- Set editing of command lines as they are typed is off. +set highlight -- Set syntax highlighting of source listings is off. set history -- Set record command history is off. set linetrace -- Set tracing execution of lines before executed is off. set listsize -- Set number of source lines bashdb will list by default. diff --git a/test/data/setshow.right b/test/data/setshow.right index ad41229e..5711610a 100644 --- a/test/data/setshow.right +++ b/test/data/setshow.right @@ -307,8 +307,7 @@ autolist : Auto run of 'list' command is off. basename : Show short filenames (the basename) in is on. debug : Allow debugging the debugger is off. different : Stepping forces stopping at a new line is off. -editing : Editing of command lines as they are typed is on. - Edit style is emacs. +editing : Editing of command lines as they are typed is off. highlight : Syntax highlight in source listings is off. history -- filename: The filename in which to record the command history is