commit 229f79c1683fa52159e692ff8b53449e117a38b2
author Vincent Law <vlaw@users.noreply.github.com> Tue Apr 22 20:35:11 2025 +0200
committer Christian Brabandt <cb@256bit.org> Tue Apr 22 20:35:11 2025 +0200
tree f9eac64f718816a15d8eeaf966ad6348ce61b273
parent 7bc988067eff6657e6f047491cadb32e0829544d

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: #17179

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

runtime/ftplugin/yaml.vim

diff --git a/runtime/ftplugin/yaml.vim b/runtime/ftplugin/yaml.vim
index 4e12350..12036a8 100644
--- 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 @@
 setlocal comments=:# commentstring=#\ %s expandtab
 setlocal formatoptions-=t formatoptions+=croql
 
-" rime input method engine uses `*.custom.yaml` as its config files
-if expand('%:r:e') ==# 'custom'
-  if !exists('current_compiler')
-    compiler rime_deployer
-    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
+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"
+  endif
+endif
+
+
 let &cpo = s:cpo_save
 unlet s:cpo_save