Merge pull request #1135 from whilei/gofmt-2018-Jun-17-00-39

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

diff --git a/cmd/micro/statusline.go b/cmd/micro/statusline.go
index 19e409d7edf5b83420590f2ad8b02cbe1f22cceb..d346a033852e0fd4a370896fa2b6fdf0f61038aa 100644 (file)
--- a/cmd/micro/statusline.go
+++ b/cmd/micro/statusline.go
@@ -47,24 +47,26 @@ func (sline *Statusline) Display() {
        file += " " + sline.view.Buf.Settings["fileformat"].(string)
 
        rightText := ""
-       if len(kmenuBinding) > 0 {
-               if globalSettings["keymenu"].(bool) {
-                       rightText += kmenuBinding + ": hide bindings"
-               } else {
-                       rightText += kmenuBinding + ": show bindings"
-               }
-       }
-       if len(helpBinding) > 0 {
+       if !sline.view.Buf.Settings["hidehelp"].(bool) {
                if len(kmenuBinding) > 0 {
-                       rightText += ", "
+                       if globalSettings["keymenu"].(bool) {
+                               rightText += kmenuBinding + ": hide bindings"
+                       } else {
+                               rightText += kmenuBinding + ": show bindings"
+                       }
                }
-               if sline.view.Type == vtHelp {
-                       rightText += helpBinding + ": close help"
-               } else {
-                       rightText += helpBinding + ": open help"
+               if len(helpBinding) > 0 {
+                       if len(kmenuBinding) > 0 {
+                               rightText += ", "
+                       }
+                       if sline.view.Type == vtHelp {
+                               rightText += helpBinding + ": close help"
+                       } else {
+                               rightText += helpBinding + ": open help"
+                       }
                }
+               rightText += " "
        }
-       rightText += " "
 
        statusLineStyle := defStyle.Reverse(true)
        if style, ok := colorscheme["statusline"]; ok {
@@ -73,6 +75,12 @@ func (sline *Statusline) Display() {
 
        // Maybe there is a unicode filename?
        fileRunes := []rune(file)
+
+       if sline.view.Type == vtTerm {
+               fileRunes = []rune(sline.view.term.title)
+               rightText = ""
+       }
+
        viewX := sline.view.x
        if viewX != 0 {
                screen.SetContent(viewX, y, ' ', nil, statusLineStyle)