From de8f4bf72f20313326f7b2666efadf49bf1a433b Mon Sep 17 00:00:00 2001 From: Dmitry Maluka Date: Tue, 23 Feb 2021 00:18:37 +0100 Subject: [PATCH] Fix regressions in buffer settings initialization (#2035) Fix regressions after ba98b55: - Unable to override filetype autodetection by setting a specific filetype for specific files, i.e. this doesn't work: "*.h": { "filetype": "c++" }, - Unable to enable/disable syntax highlighting for specific files, i.e. this doesn't work: "*.c": { "syntax": false }, - "readonly" setting doesn't work (neither global nor per-filetype). --- internal/buffer/buffer.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go index 85470d83..7e0b808f 100644 --- a/internal/buffer/buffer.go +++ b/internal/buffer/buffer.go @@ -304,11 +304,14 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT for k, v := range config.GlobalSettings { if _, ok := config.DefaultGlobalOnlySettings[k]; !ok { // make sure setting is not global-only + settings[k] = v b.Settings[k] = v } } - b.Settings["readonly"] = settings["readonly"] config.InitLocalSettings(settings, path) + b.Settings["readonly"] = settings["readonly"] + b.Settings["filetype"] = settings["filetype"] + b.Settings["syntax"] = settings["syntax"] enc, err := htmlindex.Get(settings["encoding"].(string)) if err != nil {