From 9db7991a1d20d229e840a5671d3559f7ced65c2a Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Wed, 29 Aug 2018 12:16:11 -0400 Subject: [PATCH 1/3] Handle hex codes in infocmp output --- cmd/micro/terminfo/mkinfo.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmd/micro/terminfo/mkinfo.go b/cmd/micro/terminfo/mkinfo.go index b4f40eee..48ab35ea 100644 --- a/cmd/micro/terminfo/mkinfo.go +++ b/cmd/micro/terminfo/mkinfo.go @@ -177,6 +177,13 @@ func (tc *termcap) setupterm(name string) error { if k := strings.SplitN(val, "=", 2); len(k) == 2 { tc.strs[k[0]] = unescape(k[1]) } else if k := strings.SplitN(val, "#", 2); len(k) == 2 { + if strings.HasPrefix(k[1], "0x") { + if u, err := strconv.ParseUint(k[1][2:], 16, 0); err != nil { + return (err) + } else { + tc.nums[k[0]] = int(u) + } + } if u, err := strconv.ParseUint(k[1], 10, 0); err != nil { return (err) } else { From f40abc1a59e7af41f0a93718cc60eaf32a59d1d8 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Wed, 29 Aug 2018 13:01:38 -0400 Subject: [PATCH 2/3] Fix infocmp parser Ref #1167 --- cmd/micro/terminfo/mkinfo.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/micro/terminfo/mkinfo.go b/cmd/micro/terminfo/mkinfo.go index 48ab35ea..9d222655 100644 --- a/cmd/micro/terminfo/mkinfo.go +++ b/cmd/micro/terminfo/mkinfo.go @@ -183,8 +183,7 @@ func (tc *termcap) setupterm(name string) error { } else { tc.nums[k[0]] = int(u) } - } - if u, err := strconv.ParseUint(k[1], 10, 0); err != nil { + } else if u, err := strconv.ParseUint(k[1], 10, 0); err != nil { return (err) } else { tc.nums[k[0]] = int(u) From 0e56c0c81654ec89495619d52ffd87d0a0a7cd5c Mon Sep 17 00:00:00 2001 From: Scott Jarvis Date: Sun, 2 Sep 2018 11:52:26 +0000 Subject: [PATCH 3/3] Update sh.yaml support Ash as well as Bash, Sh, Dash. --- runtime/syntax/sh.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/syntax/sh.yaml b/runtime/syntax/sh.yaml index 0dbf3952..5471e7ad 100644 --- a/runtime/syntax/sh.yaml +++ b/runtime/syntax/sh.yaml @@ -1,8 +1,8 @@ filetype: shell detect: - filename: "(\\.sh$|\\.bash|\\.bashrc|bashrc|\\.bash_aliases|bash_aliases|\\.bash_functions|bash_functions|\\.bash_profile|bash_profile|Pkgfile|pkgmk.conf|profile|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD)" - header: "^#!.*/(env +)?(ba)?sh( |$)" + filename: "(\\.sh$|\\.bash|\\.ash|\\.bashrc|bashrc|\\.bash_aliases|bash_aliases|\\.bash_functions|bash_functions|\\.bash_profile|bash_profile|\\.profile|profile|Pkgfile|pkgmk.conf|profile|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD)" + header: "^#!.*/(env +)?(ba)?(a)?sh( |$)" rules: # Numbers