Commit: runtime(toml): update syntax and ftplugin.

0 views
Skip to first unread message

Christian Brabandt

unread,
Jan 25, 2026, 1:16:22 PM (14 hours ago) Jan 25
to vim...@googlegroups.com
runtime(toml): update syntax and ftplugin.

Commit: https://github.com/vim/vim/commit/dd3aa92ce610c2f61e5b8899d68dbe7f840cc377
Author: Aman Verma <amanra...@gmail.com>
Date: Sun Jan 25 18:01:31 2026 +0000

runtime(toml): update syntax and ftplugin.

Add "-" to iskeyword. This required a change to the syntax files too
because they were using the word begin and end atoms.

closes: #17259

Co-authored-by: Teemu Ikonen <tpik...@mailbox.org>
Co-authored-by: A4-Tacks <wdsjxh...@163.com>
Signed-off-by: Aman Verma <amanra...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/ftplugin/toml.vim b/runtime/ftplugin/toml.vim
index 6bd79b1c0..6565a7622 100644
--- a/runtime/ftplugin/toml.vim
+++ b/runtime/ftplugin/toml.vim
@@ -3,7 +3,7 @@
" Homepage: https://github.com/cespare/vim-toml
" Maintainer: Aman Verma
" Author: Lily Ballard <li...@ballards.net>
-" Last Change: Sep 21, 2021
+" Last Change: May 5, 2025

if exists('b:did_ftplugin')
finish
@@ -12,10 +12,11 @@ let b:did_ftplugin = 1

let s:save_cpo = &cpo
set cpo&vim
-let b:undo_ftplugin = 'setlocal commentstring< comments<'
+let b:undo_ftplugin = 'setlocal commentstring< comments< iskeyword<'

setlocal commentstring=#\ %s
setlocal comments=:#
+setlocal iskeyword+=-

let &cpo = s:save_cpo
unlet s:save_cpo
diff --git a/runtime/syntax/toml.vim b/runtime/syntax/toml.vim
index bcb1b0b9c..961e03340 100644
--- a/runtime/syntax/toml.vim
+++ b/runtime/syntax/toml.vim
@@ -3,7 +3,7 @@
" Homepage: https://github.com/cespare/vim-toml
" Maintainer: Aman Verma
" Previous Maintainer: Caleb Spare <ces...@gmail.com>
-" Last Change: Oct 8, 2021
+" Last Change: May 5, 2025

if exists('b:current_syntax')
finish
@@ -23,15 +23,15 @@ syn region tomlString oneline start=/'/ end=/'/
" Multi-line literal strings
syn region tomlString start=/'''/ end=/'''/

-syn match tomlInteger /[+-]\=\<[1-9]\(_\=\d\)*\>/ display
-syn match tomlInteger /[+-]\=\<0\>/ display
-syn match tomlInteger /[+-]\=\<0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*\>/ display
-syn match tomlInteger /[+-]\=\<0o[0-7]\(_\=[0-7]\)*\>/ display
-syn match tomlInteger /[+-]\=\<0b[01]\(_\=[01]\)*\>/ display
-syn match tomlInteger /[+-]\=\<\(inf\|nan\)\>/ display
+syn match tomlInteger /[+-]\=[1-9]\(_\=\d\)*/ display
+syn match tomlInteger /[+-]\=0/ display
+syn match tomlInteger /[+-]\=0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*/ display
+syn match tomlInteger /[+-]\=0o[0-7]\(_\=[0-7]\)*/ display
+syn match tomlInteger /[+-]\=0b[01]\(_\=[01]\)*/ display
+syn match tomlInteger /[+-]\=\(inf\|nan\)/ display

-syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\.\d\+\>/ display
-syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*\>/ display
+syn match tomlFloat /[+-]\=\d\(_\=\d\)*\.\d\+/ display
+syn match tomlFloat /[+-]\=\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*/ display

syn match tomlBoolean /\<\%(true\|false\)\>/ display

Reply all
Reply to author
Forward
0 new messages