diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 15:38:57 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 15:38:57 +0000 |
| commit | b0a54c0318f73e8824c1299900286d1d7dcade3a (patch) | |
| tree | 40130abdf474665f42bf01fab6e42ab4a7e1e1c5 /debian/patches/bash-default-editor.diff | |
| parent | Adding upstream version 5.2.15. (diff) | |
| download | bash-b0a54c0318f73e8824c1299900286d1d7dcade3a.tar.xz bash-b0a54c0318f73e8824c1299900286d1d7dcade3a.zip | |
Adding debian version 5.2.15-2.debian/5.2.15-2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/bash-default-editor.diff')
| -rw-r--r-- | debian/patches/bash-default-editor.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/bash-default-editor.diff b/debian/patches/bash-default-editor.diff new file mode 100644 index 0000000..0784aa5 --- /dev/null +++ b/debian/patches/bash-default-editor.diff @@ -0,0 +1,31 @@ +# DP: Use `command -v editor`, as an editor, if available. + +--- a/bashline.c ++++ b/bashline.c +@@ -936,8 +936,8 @@ hostnames_matching (text) + command being entered (if no explicit argument is given), otherwise on + a command from the history file. */ + +-#define VI_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-vi}}\"" +-#define EMACS_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-emacs}}\"" ++#define VI_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-$(command -v editor || echo vi)}}\"" ++#define EMACS_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-$(command -v editor || echo emacs)}}\"" + #define POSIX_VI_EDIT_COMMAND "fc -e vi" + + static int +--- a/builtins/fc.def ++++ b/builtins/fc.def +@@ -171,11 +171,11 @@ set_verbose_flag () + } + + /* String to execute on a file that we want to edit. */ +-#define FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-vi}}" ++#define FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-$(command -v editor || echo vi)}}" + #if defined (STRICT_POSIX) + # define POSIX_FC_EDIT_COMMAND "${FCEDIT:-ed}" + #else +-# define POSIX_FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-ed}}" ++# define POSIX_FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-$(command -v editor || echo ed)}}" + #endif + + int |