Add an :edit-wait command

3 files changed, 29 insertions, 2 deletions

diff --git a/README.md b/README.md
index fe3defb..bb6a0bc 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ change or export environment variables.
 ``` kak
 set-option global connect_environment %{
   SHELL=elvish
-  export GIT_EDITOR=:attach
+  export GIT_EDITOR=kak
 }
 ```
 
diff --git a/rc/env/git.env b/rc/env/git.env
index d90e610..c7e5fd1 100644
--- a/rc/env/git.env
+++ b/rc/env/git.env
@@ -1 +1 @@
-export GIT_EDITOR=kak
+export GIT_EDITOR=:edit-wait
diff --git a/rc/paths/commands/:edit-wait b/rc/paths/commands/:edit-wait
new file mode 100755
index 0000000..7da1c3d
--- /dev/null
+++ b/rc/paths/commands/:edit-wait
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Open files
+:edit "$@"
+
+# Prompt and wait
+printf '[e]dit, [c]ontinue or [a]bort'
+read -n 1 key
+
+# Attach the session
+[ "$key" = 'e' ] && :attach; edit_exit_code=$?
+
+# Close buffers
+for file do
+  :send delete-buffer "$file"
+done
+
+# Set exit code
+case "$key" in
+  e) exit_code=$edit_exit_code ;;
+  c) exit_code=0 ;;
+  a) exit_code=1 ;;
+  *) exit_code=0 ;;
+esac
+
+# Exit code
+exit "$exit_code"