Merging debian version 2:9.1.0377-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 63 insertions, 29 deletions

diff --git a/debian/changelog b/debian/changelog
index df46d4f..035ada0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vim (2:9.1.0377-1) unstable; urgency=medium
+
+  * Merge upstream tag v9.1.0377
+  * Add ncurses-term Build-Depends for tests requiring vt420 TERM definition
+  * Backport fix for test_codestyle failure
+
+ -- James McCoy <jamessan@debian.org>  Sat, 27 Apr 2024 11:01:43 -0400
+
 vim (2:9.1.0374-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 210ac75..4d1d090 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Build-Depends:
 # Needed to run libvterm's tests
  libtool-bin <!nocheck>,
  lua5.1,
+ ncurses-term <!nocheck>,
  procps <!nocheck>,
  python3-dev,
  ruby [!alpha !ia64] <!pkg.vim.noruby>,
diff --git a/debian/copyright b/debian/copyright
index 1366467..d317b47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,16 +54,25 @@ Copyright: Andy Cedilnik <andy.cedilnik@kitware.com>
 License: BSD-3-clause
 
 Files:
+ runtime/compiler/pip_compile.vim
  runtime/ftplugin/jsonc.vim
+ runtime/ftplugin/jq.vim
  runtime/ftplugin/julia.vim
+ runtime/ftplugin/requirements.vim
  runtime/ftplugin/wat.vim
+ runtime/indent/asm.vim
+ runtime/indent/astro.vim
  runtime/indent/julia.vim
  runtime/indent/wat.vim
+ runtime/syntax/astro.vim
  runtime/syntax/bitbake.vim
+ runtime/syntax/jq.vim
  runtime/syntax/json.vim
  runtime/syntax/jsonc.vim
  runtime/syntax/julia.vim
  runtime/syntax/nix.vim
+ runtime/syntax/pandoc.vim
+ runtime/syntax/requirements.vim
  runtime/syntax/wat.vim
 Copyright:
  2013 Jeroen Ruigrok van der Werven, Eli Parra
@@ -74,6 +83,10 @@ Copyright:
  2008 Ricardo Salveti
  2022 Daiderd Jordan
  2022 James Fleming
+ 2015 raimon
+ 2017 Philip Jones
+ 2022 Wuelner Martínez
+ 2013-2019 vim-pandoc-syntax contributors
 License: Expat
 
 Files: runtime/syntax/tmux.vim
@@ -165,8 +178,16 @@ Copyright:
  Alexander Udalov
 License: Apache
 
-Files: runtime/syntax/poke.vim
-Copyright: 2021 Matthew T. Ihlenfield
+Files:
+ runtime/ftplugin/uci.vim
+ runtime/ftplugin/zathurarc.vim
+ runtime/syntax/poke.vim
+ runtime/syntax/uci.vim
+ runtime/syntax/zathurarc.vim
+Copyright:
+ 2021 Matthew T. Ihlenfield
+ 2015-2024 Colin Caine <complaints@cmcaine.co.uk>
+ 2024 Wu, Zhenyu <wuzhenyu@ustc.edu>
 License: GPL-3+
 
 License: Vim
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
index 4383084..e57cd90 100644
--- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
+++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -13,10 +13,10 @@ Signed-off-by: James McCoy <jamessan@debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
-index 1462830..a398fa0 100644
+index 4e7d517..c50ffe1 100644
 --- a/runtime/autoload/dist/ft.vim
 +++ b/runtime/autoload/dist/ft.vim
-@@ -1035,7 +1035,7 @@ export def FTtex()
+@@ -1041,7 +1041,7 @@ export def FTtex()
      var firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
      if firstNC > 0
        # Check the next thousand lines for a LaTeX or ConTeXt keyword.
diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index 4709731..12df7d3 100644
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@ -15,7 +15,7 @@ Signed-off-by: James McCoy <jamessan@debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index a79e0b2..a71d268 100644
+index 806f5f0..4ef3e9f 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
 @@ -5597,7 +5597,7 @@ A jump table for the options with a short description can be found at |Q_op|.
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index 78839e0..6d18f20 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -17,7 +17,7 @@ Signed-off-by: James Vega <jamessan@debian.org>
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main.c b/src/main.c
-index 770726f..d91a5e4 100644
+index e5faaa7..ff500d7 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -1956,6 +1956,10 @@ parse_command_name(mparm_T *parmp)
@@ -45,7 +45,7 @@ index 770726f..d91a5e4 100644
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE,
-@@ -3290,13 +3299,25 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3294,13 +3303,25 @@ source_startup_scripts(mparm_T *parmp)
  #ifdef USR_EXRC_FILE2
  		&& do_source((char_u *)USR_EXRC_FILE2, FALSE,
  						       DOSO_NONE, NULL) == FAIL
@@ -72,7 +72,7 @@ index 770726f..d91a5e4 100644
  	}
  
 diff --git a/src/os_unix.h b/src/os_unix.h
-index 4c77e15..fa1205f 100644
+index 6efd8ce..8c226a4 100644
 --- a/src/os_unix.h
 +++ b/src/os_unix.h
 @@ -207,6 +207,9 @@ typedef struct dsc$descriptor   DESC;
@@ -86,10 +86,10 @@ index 4c77e15..fa1205f 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 47a0050..ba562a3 100644
+index 36339c4..efcd310 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -4580,6 +4580,9 @@ typedef struct
+@@ -4599,6 +4599,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		// start with 'diff' set
  #endif
diff --git a/debian/patches/runtime-doc-CI-remove-trailing-white-space-in-documentati.patch b/debian/patches/runtime-doc-CI-remove-trailing-white-space-in-documentati.patch
new file mode 100644
index 0000000..aa7f9c6
--- /dev/null
+++ b/debian/patches/runtime-doc-CI-remove-trailing-white-space-in-documentati.patch
@@ -0,0 +1,22 @@
+From: Christian Brabandt <cb@256bit.org>
+Date: Sat, 27 Apr 2024 12:01:15 +0200
+Subject: runtime(doc): CI: remove trailing white space in documentation
+
+Signed-off-by: Christian Brabandt <cb@256bit.org>
+---
+ runtime/doc/cmdline.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
+index 6a7515a..214571f 100644
+--- a/runtime/doc/cmdline.txt
++++ b/runtime/doc/cmdline.txt
+@@ -650,7 +650,7 @@ followed by another Vim command:
+     :[range]!
+     a user defined command without the "-bar" argument |:command|
+ 
+-    and the following |Vim9-script| keywords: 
++    and the following |Vim9-script| keywords:
+     :abstract
+     :class
+     :enum
diff --git a/debian/patches/series b/debian/patches/series
index 10b81df..72d48da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@ debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
 debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
 debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
 debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
-ubuntu-oracular.patch
+runtime-doc-CI-remove-trailing-white-space-in-documentati.patch
 progress-linux/0001-syntax-debversions.patch
 progress-linux/0002-disable-mouse.patch
 progress-linux/0003-disable-BufReadPost.patch
diff --git a/debian/patches/ubuntu-oracular.patch b/debian/patches/ubuntu-oracular.patch
deleted file mode 100644
index 3bef56b..0000000
--- a/debian/patches/ubuntu-oracular.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: runtime(debversions): Add oracular (24.10) as Ubuntu release name
-Author: Simon Quigley <tsimonq2@ubuntu.com>
-Origin: vendor
-Forwarded: https://github.com/vim/vim/pull/14645
-Last-Update: 2024-04-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/runtime/syntax/shared/debversions.vim
-+++ b/runtime/syntax/shared/debversions.vim
-@@ -11,7 +11,7 @@ let g:debSharedSupportedVersions = [
-       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
-       \ 'bullseye', 'bookworm', 'trixie', 'forky',
-       \
--      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'mantic', 'noble',
-+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'mantic', 'noble', 'oracular',
-       \ 'devel'
-       \ ]
- let g:debSharedUnsupportedVersions = [