From 734a7d07072b686bda7bcf7fe249e6f43ef7104e Mon Sep 17 00:00:00 2001
From: Steven Chan <steven3416@gmail.com>
Date: Sat, 20 Apr 2019 12:39:40 -0700
Subject: [PATCH] Re-implement PR #1927 - `man` bufname should indicate man
 page.

---
 rc/tools/man.kak | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rc/tools/man.kak b/rc/tools/man.kak
index 41d91104..693867c7 100644
--- a/rc/tools/man.kak
+++ b/rc/tools/man.kak
@@ -1,7 +1,7 @@
 declare-option -docstring "name of the client in which documentation is to be displayed" \
     str docsclient
 
-declare-option -hidden str manpage
+declare-option -hidden str-list manpage
 
 hook -group man-highlight global WinSetOption filetype=man %{
     add-highlighter window/man-highlight group
@@ -18,7 +18,7 @@ hook -group man-highlight global WinSetOption filetype=man %{
 }
 
 hook global WinSetOption filetype=man %{
-    hook -group man-hooks window WinResize .* %{ man-impl %val{bufname} %opt{manpage} }
+    hook -group man-hooks window WinResize .* %{ man-impl %opt{manpage} }
     hook -once -always window WinSetOption filetype=.* %{ remove-hooks window man-hooks }
 }
 
@@ -33,11 +33,11 @@ define-command -hidden -params 2..3 man-impl %{ evaluate-commands %sh{
     rm ${manout}
     if [ "${retval}" -eq 0 ]; then
         printf %s\\n "
-                edit -scratch '$buffer_name'
+                edit -scratch %{*$buffer_name ${*}*}
                 execute-keys '%|cat<space>${colout}<ret>gk'
                 nop %sh{rm ${colout}}
                 set-option buffer filetype man
-                set-option window manpage '$@'
+                set-option window manpage $buffer_name $*
         "
     else
        printf %s\\n "echo -markup %{{Error}man '$@' failed: see *debug* buffer for details}"
@@ -64,5 +64,5 @@ The page can be a word, or a word directly followed by a section number between
             ;;
     esac
 
-    printf %s\\n "evaluate-commands -try-client %opt{docsclient} man-impl *man* $pagenum $subject"
+    printf %s\\n "evaluate-commands -try-client %opt{docsclient} man-impl man $pagenum $subject"
 } }