]> git.lizzy.rs Git - micro.git/commitdiff
Add hidehelp option
authorZachary Yedidia <zyedidia@gmail.com>
Sat, 28 Apr 2018 21:04:33 +0000 (17:04 -0400)
committerZachary Yedidia <zyedidia@gmail.com>
Sat, 28 Apr 2018 21:04:33 +0000 (17:04 -0400)
Fixes #1080

cmd/micro/settings.go
cmd/micro/statusline.go

index 6c6785e9744dbfab62e400800a893db826b18134..b1b1c277727a72322055b04f520e423b86324251 100644 (file)
@@ -209,6 +209,7 @@ func DefaultGlobalSettings() map[string]interface{} {
                "eofnewline":     false,
                "fastdirty":      true,
                "fileformat":     "unix",
+               "hidehelp":       false,
                "ignorecase":     false,
                "indentchar":     " ",
                "infobar":        true,
@@ -254,6 +255,7 @@ func DefaultLocalSettings() map[string]interface{} {
                "fastdirty":      true,
                "fileformat":     "unix",
                "filetype":       "Unknown",
+               "hidehelp":       false,
                "ignorecase":     false,
                "indentchar":     " ",
                "keepautoindent": false,
index 1114fd21f9966332467ceaa59c393b258bf4b91f..d346a033852e0fd4a370896fa2b6fdf0f61038aa 100644 (file)
@@ -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 {