Merge remote-tracking branch 'vim/master'

Additional test fixes:
- test_macvim:
  - remove check.vim import which is now done automatically
- test_gui:
  - Test_Buffers_Menu add conditional check to not run the
    LoadBufferMenu autocmd since in MacVim we don't use it.
  - Test_scrollbars remove go-k from the guioptions, due to MacVim's
    implementation being async compared to normal GVim. May need to
    revisit this in the future.

Also fix code indentation for MacVim-specific code to pass the new
Test_indent_of_source_files() test in test_codestyle.vim.

Author: ychin

.cirrus.yml

@@ -5,9 +5,9 @@ env:
 freebsd_task:
   name: FreeBSD
   matrix:
-    - name: FreeBSD 14.2
+    - name: FreeBSD 14.3
       freebsd_instance:
-        image_family: freebsd-14-2
+        image_family: freebsd-14-3
   timeout_in: 20m
   install_script:
     - pkg install -y gettext

.editorconfig

@@ -39,3 +39,12 @@ trim_trailing_whitespace = false
 [src/testdir/test*.vim]
 # Some tests need trailing whitespaces, for example `set showbreak=>>\ `
 trim_trailing_whitespace = false
+
+#
+# Some custom files do not use tabs
+#
+[src/sign.c]
+indent_style = space
+
+[src/sound.c]
+indent_style = space

.git-blame-ignore-revs

@@ -13,3 +13,15 @@
 # change indentation style of netrw plugin
 c363ca1ecd1f8db03663ef98dcf41eeacc3c22c7
 c673b805ad80d0aef07e745d412a2bf298ba1c07
+# fix indentation style in insexpand.c v9.1.1352
+355db99d12a89f05765948b33eecd6d9733e16bb
+# fix indentation styles in various files v9.1.1363
+c2a9000bc1b4a2cbcfeef55450c184b16906d910
+# indentation style in various files v9.1.1364
+562610cfa327c8ebff12a1700525e17a070d5e2c
+# Patch v9.1.1371
+19e1dd6b6aeb96d64122332a8c3d17b9d5ca007b
+# Patch v9.1.1372
+a4a00a7ad0cfa26685c057c11a09bec2c962346a
+# Patch v9.1.1390
+e89aef3f65388a8b627c77f250525f2a264716c5

.gitattributes

@@ -1 +1,31 @@
 src/testdir/test42.in diff
+
+# `vim.pot` is updated every time any of the *.c files are modified.  And as it
+# contains line numbers for strings from *.c files, inserting a line into a
+# single .c file may cause many lines in the `vim.pot` file to be updated.
+#
+# This generates a lot of "noise" in the diffs.  And especially considering that
+# `vim.pot` is a generated file, looking at changes in this file is not useful.
+#
+# By marking it as binary we tell the git machinery that it should not be
+# presented to the user in patches, use "git diff --text" to override
+src/po/vim.pot -diff
+
+# Although vim.pot has been marked as binary, you may want to check the textual differences
+# using git --text but still want to ignore some noisy output like:
+# - POT-Creation Date
+# - comments pointing to the message source location in
+#   *.c/*.h/*.vim/*.cpp/*.in/*.xs files followed by line numbers
+# Note: location comments should be no longer part of vim.pot, since commit 2844765e903214490e1
+# which add the --no-location argument for xgettext to no longer ouput such comments
+#
+# To ignore certain changes, setup a custom textconv filter using:
+# git config diff.ignore_vim_pot.textconv "grep -Ev '^.(POT-Creation-Date:|.*\\.([ch]|vim|in|xs|cpp):).*$'"
+src/po/vim.pot diff=ignore_vim_pot
+
+# GitHub reacts to the `linguist-generated` attribute, by ignoring marked files
+# for the repository's language statistics and hiddning changes in these files
+# by default in diffs.
+#
+# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
+src/po/vim.pot linguist-generated=true