Merge e559992309 into dc7759204b

Receive SIGINT only in RunInteractiveShell

cmd/micro/micro.go

@@ -40,8 +40,7 @@ var (
 	flagClean     = flag.Bool("clean", false, "Clean configuration directory")
 	optionFlags   map[string]*string
 
-	sigterm chan os.Signal
+	sighup chan os.Signal
-	sighup  chan os.Signal
 
 	timerChan chan func()
 )
@@ -360,9 +359,9 @@ func main() {
 
 	screen.Events = make(chan tcell.Event)
 
-	sigterm = make(chan os.Signal, 1)
+	util.Sigterm = make(chan os.Signal, 1)
 	sighup = make(chan os.Signal, 1)
-	signal.Notify(sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGABRT)
+	signal.Notify(util.Sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGABRT)
 	signal.Notify(sighup, syscall.SIGHUP)
 
 	timerChan = make(chan func())
@@ -437,7 +436,7 @@ func DoEvent() {
 			}
 		}
 		os.Exit(0)
-	case <-sigterm:
+	case <-util.Sigterm:
 		for _, b := range buffer.OpenBuffers {
 			if !b.Modified() {
 				b.Fini()

internal/shell/shell.go

@@ -11,6 +11,7 @@ import (
 
 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 )
 
 // ExecCommand executes a command using exec
@@ -95,28 +96,30 @@ func RunInteractiveShell(input string, wait bool, getOutput bool) (string, error
 	cmd.Stderr = os.Stderr
 
 	// This is a trap for Ctrl-C so that it doesn't kill micro
-	// Instead we trap Ctrl-C to kill the program we're running
+	// micro is killed if the signal is ignored only on Windows, so it is
+	// received
 	c := make(chan os.Signal, 1)
+	signal.Reset(os.Interrupt)
 	signal.Notify(c, os.Interrupt)
-	go func() {
+	err = cmd.Start()
-		for range c {
+	if err == nil {
-			cmd.Process.Kill()
+		err = cmd.Wait()
+		if wait {
+			// This is just so we don't return right away and let the user press enter to return
+			screen.TermMessage("")
 		}
-	}()
+	} else {
-
+		screen.TermMessage(err)
-	cmd.Start()
+	}
-	err = cmd.Wait()
 
 	output := outputBytes.String()
 
-	if wait {
-		// This is just so we don't return right away and let the user press enter to return
-		screen.TermMessage("")
-	}
-
 	// Start the screen back up
 	screen.TempStart(screenb)
 
+	signal.Notify(util.Sigterm, os.Interrupt)
+	signal.Stop(c)
+
 	return output, err
 }
 

internal/util/util.go

@@ -41,6 +41,8 @@ var (
 
 	// Stdout is a buffer that is written to stdout when micro closes
 	Stdout *bytes.Buffer
+	// Sigterm is a channel where micro exits when written
+	Sigterm chan os.Signal
 )
 
 func init() {

runtime/help/keybindings.md

@@ -193,6 +193,7 @@ DeleteSubWordLeft
 SelectLine
 SelectToStartOfLine
 SelectToEndOfLine
+Deselect
 InsertNewline
 InsertSpace
 Backspace
@@ -240,12 +241,16 @@ ParagraphNext
 ToggleHelp
 ToggleDiffGutter
 ToggleRuler
+ToggleKeyMenu
+ToggleHighlightSearch
 JumpLine
+ClearInfo
 ClearStatus
 ShellMode
 CommandMode
 Quit
 QuitAll
+ForceQuit
 AddTab
 PreviousTab
 NextTab