From 00e568640c781092d37a7fe5d8ebab8faeebed1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Wed, 12 Feb 2025 21:25:10 +0100 Subject: [PATCH] buffer: Fix `ReloadSettings(true)` for volatile `filetype` We shall not overwrite a volatile set `filetype` provided as argument for micro: `micro -filetype shell foo` --- internal/buffer/settings.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/buffer/settings.go b/internal/buffer/settings.go index 3bb3d0c0..fe794550 100644 --- a/internal/buffer/settings.go +++ b/internal/buffer/settings.go @@ -13,7 +13,9 @@ import ( func (b *Buffer) ReloadSettings(reloadFiletype bool) { settings := config.ParsedSettings() - if _, ok := b.LocalSettings["filetype"]; !ok && reloadFiletype { + _, local := b.LocalSettings["filetype"] + _, volatile := config.VolatileSettings["filetype"] + if reloadFiletype && !local && !volatile { // need to update filetype before updating other settings based on it b.Settings["filetype"] = "unknown" if v, ok := settings["filetype"]; ok {