neovim

commit 8d68dbf906f9559dfd6e8cb1dbc1bb26fffca74d
parent 2ea14c0cf4f5244a8ee17cd6243d37b82f5638c2
Author: Christian Clason <c.clason@uni-graz.at>
Date:   Tue, 22 Apr 2025 23:24:50 +0200

vim-patch:229f79c: runtime(yaml): fix wrong order of undo_ftplugin suboptions

This commit fixes the following error message:
```
Compiler not supported: make inc< sw< sts<
```

1. orginal value: `setl com< cms< et< fo<| compiler make inc< sw< sts<`
2. correct value: `setl com< cms< et< fo< inc< sw< sts< | compiler make`

While at it, let's also document the g:yaml_recommended_style variable.

closes: vim/vim#17179

https://github.com/vim/vim/commit/229f79c1683fa52159e692ff8b53449e117a38b2

Co-authored-by: Vincent Law <vlaw@users.noreply.github.com>
Co-authored-by: Christian Brabandt <cb@256bit.org>

Diffstat:
M
runtime/doc/filetype.txt
 | 
7
+++++++
M
runtime/ftplugin/yaml.vim
 | 
24
+++++++++++++++---------

2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
@@ -1129,6 +1129,13 @@ functions with [[ and ]].  Move around comments with ]" and [".
 The mappings can be disabled with: >
 	let g:no_vim_maps = 1
 
+YAML							*ft-yaml-plugin*
+By default, the YAML filetype plugin enables the following options: >
+	setlocal shiftwidth=2 softtabstop=2
+
+To disable this, set the following variable: >
+	let g:yaml_recommended_style = 0
+
 
 ZIG							*ft-zig-plugin*
 
diff --git a/runtime/ftplugin/yaml.vim b/runtime/ftplugin/yaml.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:             YAML (YAML Ain't Markup Language)
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se> (inactive)
-" Last Change:  2024 Oct 04
+" Last Change:          2024 Oct 04
+" 2025 Apr 22 by Vim project re-order b:undo_ftplugin (#17179)
 
 if exists("b:did_ftplugin")
   finish
@@ -16,20 +17,25 @@ let b:undo_ftplugin = "setl com< cms< et< fo<"
 setlocal comments=:# commentstring=#\ %s expandtab
 setlocal formatoptions-=t formatoptions+=croql
 
-" rime input method engine uses `*.custom.yaml` as its config files
+if get(g:, "yaml_recommended_style",1)
+  let b:undo_ftplugin ..= " sw< sts<"
+  setlocal shiftwidth=2 softtabstop=2
+endif
+
+" rime input method engine(https://rime.im/)
+" uses `*.custom.yaml` as its config files
 if expand('%:r:e') ==# 'custom'
+  " `__include` command in `*.custom.yaml`
+  " see: https://github.com/rime/home/wiki/Configuration#%E5%8C%85%E5%90%AB
+  setlocal include=__include:\\s*
+  let b:undo_ftplugin ..= " inc<"
+
   if !exists('current_compiler')
     compiler rime_deployer
-    let b:undo_ftplugin ..= "| compiler make"
+    let b:undo_ftplugin ..= " | compiler make"
   endif
-  setlocal include=__include:\\s*
-  let b:undo_ftplugin ..= " inc<"
 endif
 
-if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
-  let b:undo_ftplugin ..= " sw< sts<"
-  setlocal shiftwidth=2 softtabstop=2
-endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save