From 64fd0c72ce9875646d67c9b745cb3202bb798b49 Mon Sep 17 00:00:00 2001
From: Steven Chan <steven3416@gmail.com>
Date: Tue, 16 Apr 2019 14:22:42 -0700
Subject: [PATCH] Enable man command to show stderr message to the user

1. If there is no man page found (error 16), then echo stderr text.
2. For other kinds of errors, fail with stderr text so that command can propagate through a try/catch.
---
 rc/tools/man.kak | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/rc/tools/man.kak b/rc/tools/man.kak
index 693867c7..a7156ad4 100644
--- a/rc/tools/man.kak
+++ b/rc/tools/man.kak
@@ -26,8 +26,9 @@ define-command -hidden -params 2..3 man-impl %{ evaluate-commands %sh{
     buffer_name="$1"
     shift
     manout=$(mktemp "${TMPDIR:-/tmp}"/kak-man-XXXXXX)
+    manerr=$(mktemp "${TMPDIR:-/tmp}"/kak-man-XXXXXX)
     colout=$(mktemp "${TMPDIR:-/tmp}"/kak-man-XXXXXX)
-    MANWIDTH=${kak_window_width} man "$@" > $manout 2>/dev/null
+    MANWIDTH=${kak_window_width} man "$@" > "$manout" 2> "$manerr"
     retval=$?
     col -b -x > ${colout} < ${manout}
     rm ${manout}
@@ -35,13 +36,20 @@ define-command -hidden -params 2..3 man-impl %{ evaluate-commands %sh{
         printf %s\\n "
                 edit -scratch %{*$buffer_name ${*}*}
                 execute-keys '%|cat<space>${colout}<ret>gk'
-                nop %sh{rm ${colout}}
+                nop %sh{ rm ${colout}; rm ${manerr} }
                 set-option buffer filetype man
                 set-option window manpage $buffer_name $*
         "
+    elif [ "${retval}" -eq 16 ]; then
+        printf %s\\n "
+        echo -markup %{{Error}$(cat $manerr)}
+        nop %sh{ rm ${colout}; rm ${manerr} }
+        "
     else
-       printf %s\\n "echo -markup %{{Error}man '$@' failed: see *debug* buffer for details}"
-       rm ${colout}
+        printf %s\\n "
+        fail $(cat $manerr)
+        nop %sh{ rm ${colout}; rm ${manerr} }
+        "
     fi
 } }