up to 9.0.1664

diff --git a/vim-autopaste.patch b/vim-autopaste.patch
index b50c71db87a9c607f7616c128be1419626df69ff..8a7c0d1ffa2bfcc5232a426e11db7b299665f336 100644 (file)
--- a/vim-autopaste.patch
+++ b/vim-autopaste.patch
@@ -38,13 +38,13 @@
 +++ vim72/src/optiondefs.h     2009-05-18 22:30:25.277259155 +0300
 @@ -377,6 +377,9 @@
      {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
-                           (char_u *)&p_ai, PV_AI,
+                           (char_u *)&p_ai, PV_AI, NULL,
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
 +    {"autopaste",   "apa",  P_BOOL|P_VI_DEF,
-+                            (char_u *)&p_apa, PV_NONE,
++                            (char_u *)&p_apa, PV_NONE, NULL,
 +                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
      {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
-                           (char_u *)NULL, PV_NONE,
+                           (char_u *)NULL, PV_NONE, NULL,
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
 --- vim72/src/option.h~        2009-05-18 22:23:40.000000000 +0300
 +++ vim72/src/option.h 2009-05-18 22:30:25.277259155 +0300

diff --git a/vim-phpscript.patch b/vim-phpscript.patch
index 7a8e665255df94a13dd29b542f85c3e0706e7106..8c7f07a551c41ed712bb005c0d987d9664b8b6de 100644 (file)
--- a/vim-phpscript.patch
+++ b/vim-phpscript.patch
@@ -2,13 +2,12 @@
 +++ vim-8.2.4726/runtime/autoload/dist/script.vim      2022-04-10 12:01:55.436645032 +0200
 @@ -297,6 +297,10 @@ def DetectFromText(line1: string)
    elseif line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
-     set ft=xxd
+     setl ft=xxd
  
 +    # PHP script tag
 +  elseif line1 =~ '^<?php'
-+     set ft=php
++     setl ft=php
 +
      # RCS/CVS log output
    elseif line1 =~ '^RCS file:' || line2 =~ '^RCS file:'
-     set ft=rcslog
-
+     setl ft=rcslog

diff --git a/vim.spec b/vim.spec
index d1943375b38e03fb31b5b538d5d2a659ace74003..5ce29ae069b5849da8e42bfd0963280e5b70947d 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -31,7 +31,7 @@
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define                ver             9.0.1259
+%define                ver             9.0.1664
 %define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
@@ -52,7 +52,7 @@ License:      Charityware
 Group:         Applications/Editors/Vim
 #Source0:      ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
 Source0:       https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5: cde628e2b3edc430716beb1621e2d035
+# Source0-md5: 6ca4affc0ea89b798b1b2a9f4c972afd
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:       http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@ -1318,6 +1318,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/vim/import
 %dir %{_datadir}/vim/import/dist
 %{_datadir}/vim/import/dist/vimhelp.vim
+%{_datadir}/vim/import/dist/vimhighlight.vim
 
 %dir %{_datadir}/vim/indent
 %doc %{_datadir}/vim/indent/README.txt
@@ -1427,6 +1428,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vim/autoload/*.vim
 %exclude %{_datadir}/vim/autoload/*complete.vim
 %{_datadir}/vim/autoload/xml
+%{_datadir}/vim/autoload/zig
 %{_datadir}/vim/compiler
 %{_datadir}/vim/macros
 %{_datadir}/vim/print