From 17f0eb80cd9e55f6117b8dc61010150917b585be Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Wed, 15 Jan 2020 20:09:17 -0500 Subject: [PATCH] Readonly should only apply to default buffers Ref #1298 --- internal/buffer/buffer.go | 2 +- internal/buffer/settings.go | 2 +- runtime/syntax/zig.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go index 4c8743fb..6535b87f 100644 --- a/internal/buffer/buffer.go +++ b/internal/buffer/buffer.go @@ -211,7 +211,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT b.EventHandler = NewEventHandler(b.SharedBuffer, b.cursors) } - if b.Settings["readonly"].(bool) { + if b.Settings["readonly"].(bool) && b.Type == BTDefault { b.Type.Readonly = true } diff --git a/internal/buffer/settings.go b/internal/buffer/settings.go index 6b43bbb7..d398954c 100644 --- a/internal/buffer/settings.go +++ b/internal/buffer/settings.go @@ -35,7 +35,7 @@ func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error { } } else if option == "encoding" { b.isModified = true - } else if option == "readonly" { + } else if option == "readonly" && b.Type == BTDefault { b.Type.Readonly = nativeValue.(bool) } diff --git a/runtime/syntax/zig.yaml b/runtime/syntax/zig.yaml index 5c748626..c9cb5cd1 100644 --- a/runtime/syntax/zig.yaml +++ b/runtime/syntax/zig.yaml @@ -15,7 +15,7 @@ rules: # Numbers (hexadecimal + decimal) - constant.number: "\\b(0x[A-F0-9]+|[0-9]+)\\b" # Primitive Types / Derived Data Types - - type: "([A-Z][a-z]+|(i8|u8|i16|u16|i32|u32|i64|u64|i128|u128|isize|usize|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void|f16|f32|f64|f128|bool|void|noreturn|type|anyerror|comptime_int|comptime_float))" + - type: "\\b([A-Z][a-z]+|(i8|u8|i16|u16|i32|u32|i64|u64|i128|u128|isize|usize|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void|f16|f32|f64|f128|bool|void|noreturn|type|anyerror|comptime_int|comptime_float))\\b" - constant.string: start: "\""