github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-25 18:07:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

buffer: Fix ReloadSettings(true) for volatile filetype

Browse Source 
We shall not overwrite a volatile set `filetype` provided as argument for micro:
`micro -filetype shell foo`
This commit is contained in:
Jöran Karl
2025-02-12 21:25:10 +01:00
parent 5a62a8ead4
commit 00e568640c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/buffer/settings.go
View File

@@ -13,7 +13,9 @@ import (
func (b *Buffer) ReloadSettings(reloadFiletype bool) { func (b *Buffer) ReloadSettings(reloadFiletype bool) {
settings := config.ParsedSettings() 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 // need to update filetype before updating other settings based on it
b.Settings["filetype"] = "unknown" b.Settings["filetype"] = "unknown"
if v, ok := settings["filetype"]; ok { if v, ok := settings["filetype"]; ok {