Small fix to redraw location

[micro.git] / cmd / micro / search.go

diff --git a/cmd/micro/search.go b/cmd/micro/search.go
index ddf77aef660244b529816a18ce2ffc7200b6de63..a0233c4a60d650d12538ea99f6d4da9bdadfec82 100644 (file)
--- a/cmd/micro/search.go
+++ b/cmd/micro/search.go
@@ -84,10 +84,10 @@ func Search(searchStr string, v *View, down bool) {
        var charPos int
        text := v.Buf.String()
        if down {
-               str = text[searchStart:]
+               str = string([]rune(text)[searchStart:])
                charPos = searchStart
        } else {
-               str = text[:searchStart]
+               str = string([]rune(text)[:searchStart])
        }
        r, err := regexp.Compile(searchStr)
        if settings["ignorecase"].(bool) {
@@ -127,7 +127,7 @@ func Search(searchStr string, v *View, down bool) {
 
        v.Cursor.CurSelection[0] = FromCharPos(charPos+runePos(match[0], str), v.Buf)
        v.Cursor.CurSelection[1] = FromCharPos(charPos+runePos(match[1], str), v.Buf)
-       v.Cursor.Loc = FromCharPos(charPos+match[1]-1, v.Buf)
+       v.Cursor.Loc = v.Cursor.CurSelection[1]
        if v.Relocate() {
                v.matches = Match(v)
        }