From 28559bc1e7d4947cd1f554b462c2b810ac2f147a Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 4 Nov 2021 07:15:43 +0300 Subject: [PATCH 1/5] rc man: Rename mode to `man` The suffix seems redundant when entering the mode with the `enter-user-mode` command. Closes #3970 --- rc/tools/man.kak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc/tools/man.kak b/rc/tools/man.kak index 5e57dc06..7f69eb34 100644 --- a/rc/tools/man.kak +++ b/rc/tools/man.kak @@ -135,10 +135,10 @@ man-jump %{ } # Suggested keymaps for a user mode -declare-user-mode man-mode +declare-user-mode man define-command man-mode-map -params 3 %{ - map global man-mode %arg[1] %arg[2] -docstring %arg[3] + map global man %arg[1] %arg[2] -docstring %arg[3] } -hidden man-mode-map 'g' ': man-jump' 'Jump to a man page using selected man page link' From 924ca6b43aa20938152b92f13cfae18ad827d655 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 4 Nov 2021 07:17:54 +0300 Subject: [PATCH 2/5] rc man: Drop helper command The mappings declaration code is not necessarily more readable and the resulting command is shorter by a single flag. --- rc/tools/man.kak | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rc/tools/man.kak b/rc/tools/man.kak index 7f69eb34..0b275770 100644 --- a/rc/tools/man.kak +++ b/rc/tools/man.kak @@ -137,11 +137,7 @@ man-jump %{ # Suggested keymaps for a user mode declare-user-mode man -define-command man-mode-map -params 3 %{ - map global man %arg[1] %arg[2] -docstring %arg[3] -} -hidden - -man-mode-map 'g' ': man-jump' 'Jump to a man page using selected man page link' -man-mode-map 'j' ': try %{ man-link-next }' 'Go to next man page link' -man-mode-map 'k' ': try %{ man-link-prev }' 'Go to previous man page link' -man-mode-map 'm' ': man' 'Look up a man page' +map global man 'g' -docstring 'Jump to a man page using selected man page link' ': man-jump' +map global man 'j' -docstring 'Go to next man page link' ': try %{ man-link-next }' +map global man 'k' -docstring 'Go to previous man page link' ': try %{ man-link-prev }' +map global man 'm' -docstring 'Look up a man page' ': man' From 4cee8917ab038d6b751a8fad888e9c5406452932 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 4 Nov 2021 07:20:10 +0300 Subject: [PATCH 3/5] rc man: Let mode commands fail Commands in the `man` user mode shouldn't fail silently. --- rc/tools/man.kak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc/tools/man.kak b/rc/tools/man.kak index 0b275770..2708f41c 100644 --- a/rc/tools/man.kak +++ b/rc/tools/man.kak @@ -138,6 +138,6 @@ man-jump %{ declare-user-mode man map global man 'g' -docstring 'Jump to a man page using selected man page link' ': man-jump' -map global man 'j' -docstring 'Go to next man page link' ': try %{ man-link-next }' -map global man 'k' -docstring 'Go to previous man page link' ': try %{ man-link-prev }' +map global man 'j' -docstring 'Go to next man page link' ': man-link-next' +map global man 'k' -docstring 'Go to previous man page link' ': man-link-prev' map global man 'm' -docstring 'Look up a man page' ': man' From b7452f2c7e469878ce83d257205ee1a6e30f57a4 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 4 Nov 2021 07:28:06 +0300 Subject: [PATCH 4/5] rc man: Keep user mode alias in the prompt history The `m` user mode key is a prompt helper, it's helpful to keep it in the history by default. --- rc/tools/man.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/tools/man.kak b/rc/tools/man.kak index 2708f41c..2c32b553 100644 --- a/rc/tools/man.kak +++ b/rc/tools/man.kak @@ -140,4 +140,4 @@ declare-user-mode man map global man 'g' -docstring 'Jump to a man page using selected man page link' ': man-jump' map global man 'j' -docstring 'Go to next man page link' ': man-link-next' map global man 'k' -docstring 'Go to previous man page link' ': man-link-prev' -map global man 'm' -docstring 'Look up a man page' ': man' +map global man 'm' -docstring 'Look up a man page' ':man' From 6abcb891ea06b2dbb31691d6c8e7a534cf1e2607 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 4 Nov 2021 07:31:43 +0300 Subject: [PATCH 5/5] rc man: Gracefully fail link search --- rc/tools/man.kak | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rc/tools/man.kak b/rc/tools/man.kak index 2c32b553..facfaedf 100644 --- a/rc/tools/man.kak +++ b/rc/tools/man.kak @@ -108,8 +108,12 @@ declare-option -hidden regex man_link2 \ # Define a useful command sequence for searching a given regex # and a given sequence of search keys. define-command man-search -params 2 %{ - set-register / %arg[1] - execute-keys %arg[2] + set-register / %arg[1] + try %{ + execute-keys %arg[2] + } catch %{ + fail "Could not find man page link" + } } define-command -docstring 'Go to next man page link' \