summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2025-08-13 07:21:09 +0800
committerGitHub <noreply@github.com>2025-08-12 23:21:09 +0000
commit35be59cc7b8d39f91b70aa57eaa09dc9b4636806 (patch)
tree4c829ae588395ab42abfc403d8d9a2796104d4a8 /scripts
parent50ceac4054fd8181ab7430ae2cdd4582ce3fadf4 (diff)
vim-patch:9.1.1626: cindent: does not handle compound literals (#35319)
Problem: C-indent does not handle compound literals (@44100hertz, @Jorenar) Solution: Detect and handle compound literal and structure initialization (Anttoni Erkkilä) match '=' or "return" optionally followed by &, (typecast), { Fixes also initialization which begins with multiple opening braces. fixes: vim/vim#2090 fixes: vim/vim#12491 closes: vim/vim#17865 https://github.com/vim/vim/commit/5ba6e41d37ec29fc8360a4f06d4e95c63eb013ab Co-authored-by: Anttoni Erkkilä <anttoni.erkkila@protonmail.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vim-patch.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 77c7553612..8026e8ff09 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -262,6 +262,10 @@ preprocess_patch() {
LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/evalwindow\.c/\1\/eval\/window.c/g' \
"$file" > "$file".tmp && mv "$file".tmp "$file"
+ # Rename cindent.c to indent_c.c
+ LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/cindent\.c/\1\/indent_c.c/g' \
+ "$file" > "$file".tmp && mv "$file".tmp "$file"
+
# Rename map.c to mapping.c
LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/map\.c/\1\/mapping.c/g' \
"$file" > "$file".tmp && mv "$file".tmp "$file"