Merging debian version 2:9.1.0199-1.

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

5 files changed, 20 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index f7eca3b..7076309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vim (2:9.1.0199-1) unstable; urgency=medium
+
+  * Merge upstream tag v9.1.0199
+    + 9.1.0064: Wayland support, which can be enabled by setting
+      $GVIM_ENABLE_WAYLAND
+    + 9.1.0162: Fix error handling when saving a file with xattrs (Closes:
+      #1065978)
+    + syntax/deb822sources.vim: Fix erroneous highlighting of keywords in
+      field values. (Closes: #1061630)
+
+ -- James McCoy <jamessan@debian.org>  Sun, 24 Mar 2024 09:16:49 -0400
+
 vim (2:9.1.0016-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
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 cc448ab..4383084 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 2958f45..ce61f95 100644
+index 1462830..a398fa0 100644
 --- a/runtime/autoload/dist/ft.vim
 +++ b/runtime/autoload/dist/ft.vim
-@@ -981,7 +981,7 @@ export def FTtex()
+@@ -1035,7 +1035,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 350a329..784b588 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 1685093..7de8fed 100644
+index f58899a..76989f5 100644
 --- a/runtime/autoload/dist/script.vim
 +++ b/runtime/autoload/dist/script.vim
-@@ -412,6 +412,14 @@ def DetectFromText(line1: string)
+@@ -416,6 +416,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 0d69118..4709731 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 77efbd6..3783f3f 100644
+index a79e0b2..a71d268 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5593,7 +5593,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5597,7 +5597,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 4ac5199..78839e0 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
@@ -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 4e081b8..3655543 100644
+index 47a0050..ba562a3 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -4556,6 +4556,9 @@ typedef struct
+@@ -4580,6 +4580,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		// start with 'diff' set
  #endif