adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime(m4): Improve comments, distinguish them from #-lines

Browse Source 
closes: #18200

Signed-off-by: Damien Lejay <damien@lejay.be>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Damien Lejay
2025-09-05 17:48:39 +02:00
committed by Christian Brabandt
parent 37e7728294
commit 510ca80c58
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/syntax/m4.vim
View File

@ -3,6 +3,7 @@
" Maintainer: Claudio Fleiner (claudio@fleiner.com) " Maintainer: Claudio Fleiner (claudio@fleiner.com)
" Last Change: 2022 Jun 12 " Last Change: 2022 Jun 12
" 2025 Sep 2 by Vim project: fix a few syntax issues #18192 " 2025 Sep 2 by Vim project: fix a few syntax issues #18192
" 2025 Sep 5 by Vim project: introduce m4Disabled region #18200
" This file will highlight user function calls if they use only " This file will highlight user function calls if they use only
" capital letters and have at least one argument (i.e. the '(' " capital letters and have at least one argument (i.e. the '('
@ -24,7 +25,7 @@ endif
" – Quotes are nestable; " – Quotes are nestable;
" – The delimiters can be redefined with changequote(); here we only handle " – The delimiters can be redefined with changequote(); here we only handle
" the default pair: ` ... '; " the default pair: ` ... ';
" – Quoted text in M4 is rescanned, not treated as a literal string; " – Quoted text in M4 is rescanned, not treated as a literal string.
" Therefore the region is marked transparent so contained items retain " Therefore the region is marked transparent so contained items retain
" their normal highlighting. " their normal highlighting.
syn region m4Quoted syn region m4Quoted
@ -34,11 +35,20 @@ syn region m4Quoted
\ contains=@m4Top \ contains=@m4Top
\ transparent \ transparent
" Comments in M4:
" – According to the Open Group Base Specification, comments start with
" a <number-sign> (#) and end at <newline>, unless redefined with changecom().
" We only handle the default here.
" – Comments in M4 are not like in most languages: they do not remove the text,
" they simply prevent any macros from being expanded, while the text remains
" in the output. This region therefore disables any other matches.
" – Comments themselves are disabled when quoted.
syn region m4Disabled start=+#+ end=+$+ containedin=ALLBUT,m4Quoted
" define the m4 syntax " define the m4 syntax
syn match m4Variable contained "\$\d\+" syn match m4Variable contained "\$\d\+"
syn match m4Special contained "$[@*#]" syn match m4Special contained "$[@*#]"
syn match m4Comment "\<\(m4_\)\=dnl\>.*" contains=SpellErrors syn match m4Comment "\<\(m4_\)\=dnl\>.*" contains=SpellErrors
syn match m4Comment "#.*" contains=SpellErrors
syn match m4Constants "\<\(m4_\)\=__file__" syn match m4Constants "\<\(m4_\)\=__file__"
syn match m4Constants "\<\(m4_\)\=__line__" syn match m4Constants "\<\(m4_\)\=__line__"
syn keyword m4Constants divnum sysval m4_divnum m4_sysval syn keyword m4Constants divnum sysval m4_divnum m4_sysval