From 7d1d118fee3d072a92f2e34c87d8e6138983b3b3 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Sun, 22 May 2016 17:52:42 -0400 Subject: [PATCH] Improve the scrollmargin behavior at the end of the buffer --- cmd/micro/view.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/micro/view.go b/cmd/micro/view.go index 9a759a47..ce91860e 100644 --- a/cmd/micro/view.go +++ b/cmd/micro/view.go @@ -203,9 +203,12 @@ func (v *View) Relocate() bool { v.Topline = cy ret = true } - if cy > v.Topline+v.height-1-scrollmargin { + if cy > v.Topline+v.height-1-scrollmargin && cy < v.Buf.NumLines-scrollmargin { v.Topline = cy - v.height + 1 + scrollmargin ret = true + } else if cy >= v.Buf.NumLines-scrollmargin { + v.Topline = v.Buf.NumLines - v.height + ret = true } cx := v.Cursor.GetVisualX()