Merge commit '484a904fa7' as 'nginx'

2026-04-30 00:59:20 +00:00 · 2026-04-30 00:59:20 +00:00 · 2b63c55768
commit 2b63c55768
parent a9df3b8ae9 484a904fa7
528 changed files with 294288 additions and 0 deletions
--- a/nginx/contrib/vim/indent/nginx.vim
+++ b/nginx/contrib/vim/indent/nginx.vim
@ -0,0 +1,11 @@
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=
+
+" cindent actually works for nginx' simple file structure
+setlocal cindent
+" Just make sure that the comments are not reset as defs would be.
+setlocal cinkeys-=0#