Merge remote-tracking branch 'upstream/master' into tabsidebar

rbtnn · Dec 20, 2024 · f9adac0 · f9adac0
2 parents 16e17b8 + af0fed5
commit f9adac0
Show file tree

Hide file tree

Showing 101 changed files with 13,144 additions and 9,865 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -23,3 +23,7 @@ trim_trailing_whitespace = false
 [runtime/doc/**.txt]
 # It can mess up some documentation by trying to strip trailing whitespaces
 trim_trailing_whitespace = false
+
+[src/testdir/test*.vim]
+# Some tests need trailing whitespaces, for example `set showbreak=>>\ `
+trim_trailing_whitespace = false
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -10,3 +10,5 @@
 8ce738de3fd7192fa6274730594305cde780074c
 # Patch v9.1.0879 reformated sound.c and sign.c
 3cf094edaff815141d9941b8dba52b9e77d8dfc1
+# change indentation style of netrw plugin
+c363ca1ecd1f8db03663ef98dcf41eeacc3c22c7
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -323,7 +323,7 @@ jobs:
       fail-fast: false
       matrix:
         features: [tiny, normal, huge]
-        runner: [macos-13, macos-14]
+        runner: [macos-13, macos-15]
 
     steps:
       - name: Checkout repository from github
@@ -335,11 +335,11 @@ jobs:
           brew install lua libtool
           echo "LUA_PREFIX=$(brew --prefix)" >> $GITHUB_ENV
 
-      - name: Grant microphone access for macos-14
-        if: matrix.features == 'huge' && matrix.runner == 'macos-14'
+      - name: Set up Xcode
+        if: matrix.runner == 'macos-15'
         run: |
-          # Temporary fix to fix microphone permission issues for macos-14 when playing sound.
-          sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
+          # Xcode 16 has compiler bugs which are fixed in 16.2+
+          sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
 
       - name: Set up environment
         run: |

diff --git a/Filelist b/Filelist
@@ -771,6 +771,8 @@ RT_ALL =	\
 		runtime/tutor/tutor1 \
 		runtime/tutor/en/vim-01-beginner.tutor \
 		runtime/tutor/en/vim-01-beginner.tutor.json \
+		runtime/tutor/it/vim-01-beginner.tutor \
+		runtime/tutor/it/vim-01-beginner.tutor.json \
 		runtime/tutor/tutor.tutor \
 		runtime/tutor/tutor.tutor.json \
 		runtime/tutor/tutor.vim \