Skip to content

Commit 32bd5ce

Browse files
Merge branch 'StatusInfoLuaError' into dev
2 parents 66780d8 + 02ef358 commit 32bd5ce

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
> - [Adding auto complete support for multi cursors #3442](https://github.com/zyedidia/micro/pull/3442)
1616
> - [Fixing comment plugin not using user settings when overriding default setting #3424](https://github.com/zyedidia/micro/pull/3424)
1717
> - [Add the ability lock settings.json and bindings.json for plugins #3618](https://github.com/zyedidia/micro/pull/3618)
18-
> - [Add missing resize in TabMove #3619](https://github.com/zyedidia/micro/pull/3619)
18+
> - [Adding error screen for lua functions running in status line #3691 ](https://github.com/zyedidia/micro/pull/3691)
1919
>
2020
> To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
2121

internal/display/statusline.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ func SetStatusInfoFnLua(fn string) {
8383
} else {
8484
return string(v)
8585
}
86+
} else {
87+
screen.TermMessage(plFn, "failed with error\n"+err.Error())
8688
}
8789
return ""
8890
}

0 commit comments

Comments
 (0)