NeonXP/micro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Caps lock issue#658 (#659)

Browse source 
* caps-lock-issue #658

* when esc key is pressed the message is cleared away
This commit is contained in:
Tommy 2017-05-10 15:02:17 +01:00 committed by Zachary Yedidia
parent ef0f506b6f
commit 7c80de7ee1
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/micro/messenger.go
View file

@ -161,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
}

11
cmd/micro/view.go
View file

@ -199,18 +199,19 @@ func (v *View) ScrollDown(n int) {
// causing them to lose the unsaved changes
func (v *View) CanClose() bool {
if v.Type == vtDefault && v.Buf.IsModified {
var char rune
var choice bool
var canceled bool
if v.Buf.Settings["autosave"].(bool) {
char = 'y'
choice = true
} else {
char, canceled = messenger.LetterPrompt("Save changes to "+v.Buf.GetName()+" before closing? (y,n,esc) ", 'y', 'n', 'Y', 'N')
choice, canceled = messenger.YesNoPrompt("Save changes to " + v.Buf.GetName() + " before closing? (y,n,esc) ")
}
if !canceled {
if char == 'y' || char == 'Y' {
//if char == 'y' {
if choice {
v.Save(true)
return true
} else if char == 'n' || char == 'N' {
} else {
return true
}
}