From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Fri, 4 Feb 2022 23:10:41 +0000 (+0100)
Subject: Up to 8.2.4295.
X-Git-Tag: auto/th/vim-8.2.4295-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=27f1ff4f9e22eb0f3c553442d77a02e86b5271a2;p=packages%2Fvim.git

Up to 8.2.4295.
---

diff --git a/vim-ft-gyp.patch b/vim-ft-gyp.patch
index db304b0..e698a25 100644
--- a/vim-ft-gyp.patch
+++ b/vim-ft-gyp.patch
@@ -1,12 +1,13 @@
 --- vim-8.2.2976/runtime/filetype.vim~	2021-06-12 10:01:08.000000000 +0200
 +++ vim-8.2.2976/runtime/filetype.vim	2021-06-12 10:02:30.456368850 +0200
-@@ -711,6 +711,9 @@ au BufNewFile,BufRead */etc/group,*/etc/
+@@ -2347,6 +2347,9 @@ au BufNewFile,BufRead */gitolite-admin/c
  " GTK RC
- au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
+ au BufNewFile,BufRead .gtkrc*,gtkrc*		call s:StarSetf('gtkrc')
  
 +" GYP (Python syntax)
 +au BufNewFile,BufRead *.gyp,*.gypi,DEPS		set filetype=python expandtab tabstop=2 shiftwidth=2
 +
- " Haml
- au BufNewFile,BufRead *.haml			setf haml
+ " Jam
+ au BufNewFile,BufRead Prl*.*,JAM*.*		call s:StarSetf('jam')
  
+
diff --git a/vim-ft-mysql.patch b/vim-ft-mysql.patch
index 1149602..860e500 100644
--- a/vim-ft-mysql.patch
+++ b/vim-ft-mysql.patch
@@ -1,11 +1,12 @@
 --- vim72/runtime/filetype.vim~	2010-01-21 21:47:56.000000000 +0200
 +++ vim72/runtime/filetype.vim	2010-04-22 14:27:15.550974158 +0300
-@@ -1151,7 +1151,7 @@
+@@ -1171,7 +1171,7 @@ au BufNewFile,BufRead mrxvtrc,.mrxvtrc
  au BufNewFile,BufRead *.msql			setf msql
  
  " Mysql
 -au BufNewFile,BufRead *.mysql			setf mysql
-+au BufNewFile,BufRead *.mysql,.*mysql_history*			setf mysql
++au BufNewFile,BufRead *.mysql,.*mysql_history*	setf mysql
  
- " Mutt setup files (must be before catch *.rc)
- au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+ " Tcl Shell RC file
+ au BufNewFile,BufRead tclsh.rc			setf tcl
+
diff --git a/vim-nagios.patch b/vim-nagios.patch
index ed47869..876055f 100644
--- a/vim-nagios.patch
+++ b/vim-nagios.patch
@@ -1,11 +1,12 @@
 --- vim-7.0/runtime/filetype.vim~	2006-03-30 22:10:33.046344554 +0300
 +++ vim-7.0/runtime/filetype.vim	2006-03-30 23:14:19.721780355 +0300
-@@ -2095,6 +2095,8 @@
- au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
- au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
+@@ -2255,6 +2255,8 @@ au BufNewFile,BufRead *
+ 	\ | runtime! scripts.vim | endif
+ au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
  
 +" Nagios config
 +au BufNewFile,BufRead /*etc/nagios/*.cfg,*sample-config/template-object/*.cfg{,.in},/var/lib/nagios/objects.cache set filetype=nagios
  
  " Plain text files, needs to be far down to not override others.  This avoids
  " the "conf" type being used if there is a line starting with '#'.
+
diff --git a/vim-smarty.patch b/vim-smarty.patch
index f8c82d2..4b8f68c 100644
--- a/vim-smarty.patch
+++ b/vim-smarty.patch
@@ -1,14 +1,14 @@
 --- ./runtime/filetype.vim	2006-01-12 17:26:15.000000000 +0200
 +++ /tmp/filetype.vim	2006-01-12 17:25:53.000000000 +0200
-@@ -590,6 +590,9 @@
+@@ -792,6 +792,9 @@ au BufRead,BufNewFile *.heex			setf heex
  " HEX (Intel)
  au BufNewFile,BufRead *.hex,*.h32		setf hex
  
 +" Smarty templates (must be before HTML)
-+au BufNewFile,BufRead *.tpl.html,*.tpl			setf smarty
++au BufNewFile,BufRead *.tpl.html,*.tpl		setf smarty
 +
- " Hollywood
- au BufRead,BufNewFile *.hws			setf hollywood
+ " Hjson
+ au BufNewFile,BufRead *.hjson			setf hjson
  
 @@ -1396,9 +1399,6 @@
  	\  setf st |
diff --git a/vim.spec b/vim.spec
index bce2076..b414f6d 100644
--- 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		8.2.3570
+%define		ver		8.2.4295
 %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:	50cbcd6e830061176ab268fdedd4690a
+# Source0-md5:	4fbb220d69db1931ac4b71de340b7b73
 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