Merge pull request #1071 from twpayne/windows-default-editor

Use notepad.exe, not vi, as the default editor on Windows

cmd/config.go

@@ -735,11 +735,11 @@ func (c *Config) editor() (string, []string) {
 		return c.Edit.Command, c.Edit.Args
 	}
 
-	// Prefer $VISUAL over $EDITOR and fallback to vi.
+	// Prefer $VISUAL over $EDITOR and fallback to the OS's default editor.
 	editor := firstNonEmptyString(
 		os.Getenv("VISUAL"),
 		os.Getenv("EDITOR"),
-		"vi",
+		defaultEditor,
 	)
 
 	// If editor is found, return it.

cmd/util_unix.go

@@ -6,6 +6,8 @@ import (
 	"io"
 )
 
+const defaultEditor = "vi"
+
 // enableVirtualTerminalProcessing does nothing.
 func enableVirtualTerminalProcessing(w io.Writer) error {
 	return nil

cmd/util_windows.go

@@ -7,6 +7,8 @@ import (
 	"golang.org/x/sys/windows"
 )
 
+const defaultEditor = "notepad.exe"
+
 // enableVirtualTerminalProcessing enables virtual terminal processing. See
 // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences.
 func enableVirtualTerminalProcessing(w io.Writer) error {