From 5d9ca3be51c40b211b5d1d2a9c590a4195dd38fc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 22:09:16 +0000
Subject: [PATCH] vim: Import v9.1.0679

* runtime(doc): clarify the effect of :keeppatterns after v9.1.0677
* runtime(doc): update Makefile and make it portable between GNU and BSD
* 9.1.0679: Rename from w_closing to w_locked is incomplete
* runtime(colors): update colorschemes
* runtime(vim): Update base-syntax, improve :let-heredoc highlighting
* runtime(doc): Updating the examples in the xxd manpage
* translation(ru): Updated uganda.rux
---
 gitlog.txt | 2 +-
 vim        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitlog.txt b/gitlog.txt
index bcab6003..0cff3986 100644
--- a/gitlog.txt
+++ b/gitlog.txt
@@ -1 +1 @@
-* [runtime(yaml): do not re-indent when commenting out lines](https://github.com/vim/vim/commit/c6ed816761f44da92d8c61f5ea6cb7fdbb45fac5)\n* [9.1.0678](https://github.com/vim/vim/commit/0a6e57b09bc8c76691b367a5babfb79b31b770e8): \[security\]: use-after-free in alist\_add()\n* [9.1.0677](https://github.com/vim/vim/commit/3b59be4ed8a145d3188934f1a5cd85432bd2433d): :keepp does not retain the substitute pattern\n* [translation(ja): Update Japanese translations to latest release](https://github.com/vim/vim/commit/12cb1d1326c785c0f44303d113f27edcd473cb33)\n* [runtime(netrw): Drop committed trace lines](https://github.com/vim/vim/commit/1fbccc1e9694e5e6162dff112b49a093eac770ee)\n* [runtime(netrw): Error popup not always used](https://github.com/vim/vim/commit/b4d11644254ec6e29aed93a9fdcde2160163aefd)\n* [runtime(netrw): ErrorMsg() may throw E121](https://github.com/vim/vim/commit/7c754110ff8e0d666d422f1644bc356c8fee7392)\n* [runtime(tutor): update Makefile and make it portable between GNU and BSD](https://github.com/vim/vim/commit/1869fe0ce6f0c1cc37e02623b2a372e1c81f6864)\n* [translation: improve the po/cleanup.vim script](https://github.com/vim/vim/commit/cca3df9275c6f76e3b31ad9b13ced91a44e1855b)\n* [runtime(lang): update Makefile and make it portable between GNU and BSD](https://github.com/vim/vim/commit/5f995c92e7658acd16f73c6f6c5a2b9c2e0bdbcd)\n* [9.1.0676](https://github.com/vim/vim/commit/81b62dd65435d6d7917934daf5eff42eca8906f8): style issues with man pages
+* [runtime(doc): clarify the effect of :keeppatterns after v9.1.0677](https://github.com/vim/vim/commit/cba93cab533b5da26b9e4a4338c1dc6e8aa3d409)\n* [runtime(doc): update Makefile and make it portable between GNU and BSD](https://github.com/vim/vim/commit/9b7d55ee26d1a811db8351f723d63402ce94b97c)\n* [9.1.0679](https://github.com/vim/vim/commit/bc11f6d9d4f580179d3963f3c489881904d6cd62): Rename from w\_closing to w\_locked is incomplete\n* [runtime(colors): update colorschemes](https://github.com/vim/vim/commit/6908db475603c0f37aaf4c3ba13dfdbebd340003)\n* [runtime(vim): Update base-syntax, improve :let-heredoc highlighting](https://github.com/vim/vim/commit/d164f2a521f8e52e587727657fb1c19e9a25f32a)\n* [runtime(doc): Updating the examples in the xxd manpage](https://github.com/vim/vim/commit/8f3f78546f649a76d9149ffdcf13a526aab8d4ed)\n* [translation(ru): Updated uganda.rux](https://github.com/vim/vim/commit/85c724ea0e4ae1744061a6af4200015a5ee6c9cf)
diff --git a/vim b/vim
index c6ed8167..cba93cab 160000
--- a/vim
+++ b/vim
@@ -1 +1 @@
-Subproject commit c6ed816761f44da92d8c61f5ea6cb7fdbb45fac5
+Subproject commit cba93cab533b5da26b9e4a4338c1dc6e8aa3d409