Merging debian version 2:9.1.0496-1.

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

8 files changed, 18 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index 30d6a86..01467bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vim (2:9.1.0496-1) unstable; urgency=medium
+
+  * Merge upstream tag v9.1.0496
+  * Refresh patches; drop backported test_codestyle patch
+
+ -- James McCoy <jamessan@debian.org>  Wed, 19 Jun 2024 21:07:11 -0400
+
 vim (2:9.1.0377-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/copyright b/debian/copyright
index d317b47..b72e1fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: https://github.com/vim/vim
 
 Files: *
 Copyright: 2001-2023 Bram Moolenaar <Bram@vim.org>
-           2023 The Vim Project
+           2023-2024 The Vim Project
            2006 Benji Fisher <benji@member.ams.org>
            1999-2021 Charles E. Campbell, Jr. <drchip@campbellfamily.biz>
            2003 Fred Barnes
@@ -30,7 +30,7 @@ License: Vim
 Files: runtime/doc/*
 Copyright:
  1988-2023 Bram Moolenaar <Bram@vim.org>
- 2023 The Vim Project
+ 2023-2024 The Vim Project
 License: OPL-1+
 Comment: No license options are exercised.  See https://bugs.debian.org/384019
  for discussions confirming DFSG-ness of this license when no options are
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 e57cd90..a13aeac 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 4e7d517..c50ffe1 100644
+index bf9e32e..2f11f7a 100644
 --- a/runtime/autoload/dist/ft.vim
 +++ b/runtime/autoload/dist/ft.vim
-@@ -1041,7 +1041,7 @@ export def FTtex()
+@@ -1071,7 +1071,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/Detect-the-rst-filetype-using-the-contents-of-the-file.patch b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
index 784b588..70c25bb 100644
--- a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
+++ b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
@@ -8,10 +8,10 @@ Closes: #382541
  1 file changed, 8 insertions(+)
 
 diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
-index f58899a..76989f5 100644
+index 33ed7fd..0e10e3d 100644
 --- a/runtime/autoload/dist/script.vim
 +++ b/runtime/autoload/dist/script.vim
-@@ -416,6 +416,14 @@ def DetectFromText(line1: string)
+@@ -420,6 +420,14 @@ def DetectFromText(line1: string)
    elseif line1 =~ 'exec\s\+\S*scheme' || line2 =~ 'exec\s\+\S*scheme'
      setl ft=scheme
  
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 12df7d3..926b47e 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,10 +15,10 @@ 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 806f5f0..4ef3e9f 100644
+index 6ec4031..1687b8e 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|.
+@@ -5611,7 +5611,7 @@ A jump table for the options with a short description can be found at |Q_op|.
  
  				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
  'modeline' 'ml'		boolean	(Vim default: on (off for root),
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 6d18f20..25d23e4 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
@@ -72,7 +72,7 @@ index e5faaa7..ff500d7 100644
  	}
  
 diff --git a/src/os_unix.h b/src/os_unix.h
-index 6efd8ce..8c226a4 100644
+index 99184ab..6db866e 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 6efd8ce..8c226a4 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 36339c4..efcd310 100644
+index 7e21f0f..8ed1481 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -4599,6 +4599,9 @@ typedef struct
+@@ -4603,6 +4603,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
deleted file mode 100644
index aa7f9c6..0000000
--- a/debian/patches/runtime-doc-CI-remove-trailing-white-space-in-documentati.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 72d48da..dadfd69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ 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
-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