Merge branch 'main' into master

Author: mcDevnagh

internal/adapter/editor/editor.go

@@ -39,7 +39,7 @@ func (e *Editor) Open(paths ...string) error {
 	// initial note content to `zk new`. Without this, Vim doesn't work
 	// properly in this case.
 	// See https://github.com/zk-org/zk/issues/4
-	cmd := executil.CommandFromString(e.editor + " " + shellquote.Join(paths...) + " </dev/tty")
+	cmd := executil.CommandFromString(e.editor + " " + shellquote.Join(paths...) + CMD_SUFFIX)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

internal/adapter/editor/suffix-windows.go

@@ -0,0 +1,5 @@
+//go:build windows
+
+package editor
+
+const CMD_SUFFIX = ""

internal/adapter/editor/suffix.go

@@ -0,0 +1,5 @@
+//go:build !windows
+
+package editor
+
+const CMD_SUFFIX = " </dev/tty"

internal/adapter/fzf/note_filter.go

@@ -98,7 +98,7 @@ func (f *NoteFilter) Apply(notes []core.ContextualNote) ([]core.ContextualNote,
 			bindings = append(bindings, Binding{
 				Keys:        newBinding,
 				Description: "create a note with the query as title" + suffix,
-				Action:      fmt.Sprintf(`abort+execute("%s" new "%s" --title {q} < /dev/tty > /dev/tty)`, zkBin, dir.Path),
+				Action:      fmt.Sprintf(`become("%s" new "%s" --title {q} < /dev/tty > /dev/tty)`, zkBin, dir.Path),
 			})
 		}
 	}