github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-21 08:17:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cross-compile'

Browse Source
This commit is contained in:
Zachary Yedidia
2016-03-22 18:31:50 -04:00
parent 7184b92488 9328d42def
commit 28b07d62e6
85 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/highlighter.go
View File

@@ -149,9 +149,9 @@ func Match(rules string, buf *Buffer, v *View) map[int]tcell.Style {
color := string(submatch[1])
var regexStr string
if len(submatch) == 4 {
regexStr = "(?m" + string(submatch[2]) + ")" + string(submatch[3])
regexStr = "(?m" + string(submatch[2]) + ")" + JoinRule(string(submatch[3]))
} else if len(submatch) == 3 {
regexStr = "(?m)" + string(submatch[2])
regexStr = "(?m)" + JoinRule(string(submatch[2]))
}
regex, err := regexp.Compile(regexStr)
if err != nil {

2
src/view.go
View File

@@ -268,7 +268,7 @@ func (v *View) HandleEvent(event tcell.Event) int {
v.ScrollDown(1)
y = v.height + v.topline - 1
}
if y > len(v.buf.lines) {
if y >= len(v.buf.lines) {
y = len(v.buf.lines) - 1
}
if x < 0 {