From c9abe1b1ff6e7ebbad9044941a0d7ea70b16802d Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 18 Jul 2015 02:31:35 +0900 Subject: [PATCH] Show more specific error message on invalid binding --- src/options.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/options.go b/src/options.go index 1f53549..82dc6d9 100644 --- a/src/options.go +++ b/src/options.go @@ -453,12 +453,9 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b origPairStr := str[idx : idx+len(pairStr)] idx += len(pairStr) + 1 - fail := func() { - errorExit("invalid key binding: " + pairStr) - } pair := strings.SplitN(pairStr, ":", 2) - if len(pair) != 2 { - fail() + if len(pair) < 2 { + errorExit("bind action not specified: " + origPairStr) } var key int if len(pair[0]) == 1 && pair[0][0] == escapedColon { @@ -467,9 +464,6 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b key = ',' + curses.AltZ } else { keys := parseKeyChords(pair[0], "key name required") - if len(keys) != 1 { - fail() - } key = firstKey(keys) }