X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fmessenger.go;h=3fda5368fc092925c8c696c4fe963ee6058f514e;hb=97e2fb12883b10002e7b08feef3110495d22bb4a;hp=c7f081bd7ace97fda04db685309ef8f009b11e1b;hpb=1a95f34b0eb8d793bfa4133a532ce1c635db71d0;p=micro.git

diff --git a/cmd/micro/messenger.go b/cmd/micro/messenger.go
index c7f081bd..3fda5368 100644
--- a/cmd/micro/messenger.go
+++ b/cmd/micro/messenger.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"strconv"
-	"strings"
 
 	"github.com/zyedidia/clipboard"
 	"github.com/zyedidia/tcell"
@@ -79,7 +78,7 @@ func (m *Messenger) AddLog(msg string) {
 
 func (m *Messenger) getBuffer() *Buffer {
 	if m.log == nil {
-		m.log = NewBuffer(strings.NewReader(""), "")
+		m.log = NewBufferFromString("", "")
 		m.log.name = "Log"
 	}
 	return m.log
@@ -162,17 +161,19 @@ func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
 		case *tcell.EventKey:
 			switch e.Key() {
 			case tcell.KeyRune:
-				if e.Rune() == 'y' {
+				if e.Rune() == 'y' || e.Rune() == 'Y' {
 					m.AddLog("\t--> y")
 					m.hasPrompt = false
 					return true, false
-				} else if e.Rune() == 'n' {
+				} else if e.Rune() == 'n' || e.Rune() == 'N' {
 					m.AddLog("\t--> n")
 					m.hasPrompt = false
 					return false, false
 				}
 			case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
 				m.AddLog("\t--> (cancel)")
+				m.Clear()
+				m.Reset()
 				m.hasPrompt = false
 				return false, true
 			}