Merge

Fixes #403

cmd/micro/messenger.go

@@ -21,10 +21,10 @@ func TermMessage(msg ...interface{}) {
 	screenWasNil := screen == nil
 	if !screenWasNil {
 		screen.Fini()
+		screen = nil
 	}
 
 	fmt.Println(msg...)
-	messenger.AddLog(fmt.Sprint(msg...))
 	fmt.Print("\nPress enter to continue")
 
 	reader := bufio.NewReader(os.Stdin)

cmd/micro/pluginmanager.go

@@ -120,7 +120,7 @@ func (pc PluginChannels) Fetch() PluginPackages {
 
 // Fetch retrieves all available PluginPackages from the given channel
 func (pc PluginChannel) Fetch() PluginPackages {
-	messenger.AddLog(fmt.Sprintf("Fetching channel: %q", string(pc)))
+	// messenger.AddLog(fmt.Sprintf("Fetching channel: %q", string(pc)))
 	resp, err := http.Get(string(pc))
 	if err != nil {
 		TermMessage("Failed to query plugin channel:\n", err)
@@ -141,7 +141,7 @@ func (pc PluginChannel) Fetch() PluginPackages {
 
 // Fetch retrieves all available PluginPackages from the given repository
 func (pr PluginRepository) Fetch() PluginPackages {
-	messenger.AddLog(fmt.Sprintf("Fetching repository: %q", string(pr)))
+	// messenger.AddLog(fmt.Sprintf("Fetching repository: %q", string(pr)))
 	resp, err := http.Get(string(pr))
 	if err != nil {
 		TermMessage("Failed to query plugin repository:\n", err)

cmd/micro/view.go

@@ -753,7 +753,7 @@ func (v *View) DisplayView() {
 				// First the user may have configured an `indent-char` to be displayed to show that this
 				// is a tab character
 				lineIndentStyle := defStyle
-				if style, ok := colorscheme["indent-char"]; ok {
+				if style, ok := colorscheme["indent-char"]; ok && v.Buf.Settings["indentchar"].(string) != " " {
 					lineIndentStyle = style
 				}
 				if v.Cursor.HasSelection() &&