diff --git a/cmd/micro/terminfo/mkinfo.go b/cmd/micro/terminfo/mkinfo.go index b4f40eee..9d222655 100644 --- a/cmd/micro/terminfo/mkinfo.go +++ b/cmd/micro/terminfo/mkinfo.go @@ -177,7 +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 u, err := strconv.ParseUint(k[1], 10, 0); err != nil { + 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) + } + } else if u, err := strconv.ParseUint(k[1], 10, 0); err != nil { return (err) } else { tc.nums[k[0]] = int(u) 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