[packages/vim] - up to 7.4.1943

[arekm]

commit a39abb0052109adcb0db5fe05997bdac8e36ca75
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Jun 18 20:38:27 2016 +0200

    - up to 7.4.1943

 desktop.patch    |  6 +++---
 vim-vimrc.patch  | 10 +++++-----
 vim-visual.patch | 11 -----------
 vim.spec         | 12 +++++++-----
 4 files changed, 15 insertions(+), 24 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index edbef23..fec49f1 100644
--- a/vim.spec
+++ b/vim.spec
@@ -28,8 +28,8 @@
 # tail -n1 sources | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define		ver		7.4.1236
-%define		rel		4
+%define		ver		7.4.1943
+%define		rel		1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
 Summary(es.UTF-8):	Editor visual incrementado
@@ -49,7 +49,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:	bca123584eb843c485c687861d54ad27
+# Source0-md5:	0ea9464041fe4b1f09e760c8ab6687ec
 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
@@ -70,7 +70,7 @@ Source32:	oceandeep.vim
 # http://www.vim.org/scripts/script.php?script_id=1464 (2.6.3)
 Source33:	moria.vim
 Patch0:		%{name}-sysconfdir.patch
-Patch1:		%{name}-visual.patch
+
 Patch2:		%{name}-paths.patch
 Patch3:		%{name}-no_libelf.patch
 Patch4:		%{name}-egrep.patch
@@ -746,7 +746,7 @@ cp -p runtime/gvim.desktop gvim-gtk.desktop
 cp -p runtime/gvim.desktop gvim-motif.desktop
 
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -1253,6 +1253,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/vim/keymap/README.txt
 %{_datadir}/vim/keymap/*.vim
 
+%{_datadir}/vim/pack
+
 %dir %{_datadir}/vim/plugin
 %doc %{_datadir}/vim/plugin/README.txt
 
diff --git a/desktop.patch b/desktop.patch
index 1ace859..ae1cbb8 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -50,7 +50,6 @@
  Comment[pt_BR]=Edite arquivos de texto
  Comment[ro]=Editare fişiere text
 @@ -70,11 +70,11 @@
- Comment[wa]=Asspougnî des fitchîs tecses
  Comment[zh_CN]=编辑文本文件
  Comment[zh_TW]=編輯文字檔
 -TryExec=gvim
@@ -59,6 +58,7 @@
 +Exec=gvim.gnome -f %F
  Terminal=false
  Type=Application
+ Keywords=Text;editor;
  Icon=gvim
 -Categories=Utility;TextEditor;
 +Categories=GTK;GNOME;TextEditor;
@@ -87,7 +87,6 @@
  Comment[pt_BR]=Edite arquivos de texto
  Comment[ro]=Editare fişiere text
 @@ -70,11 +70,11 @@
- Comment[wa]=Asspougnî des fitchîs tecses
  Comment[zh_CN]=编辑文本文件
  Comment[zh_TW]=編輯文字檔
 -TryExec=gvim
@@ -96,6 +95,7 @@
 +Exec=gvim.gtk -f %F
  Terminal=false
  Type=Application
+ Keywords=Text;editor;
  Icon=gvim
 -Categories=Utility;TextEditor;
 +Categories=GTK;TextEditor;
@@ -124,7 +124,6 @@
  Comment[pt_BR]=Edite arquivos de texto
  Comment[ro]=Editare fişiere text
 @@ -70,11 +70,11 @@
- Comment[wa]=Asspougnî des fitchîs tecses
  Comment[zh_CN]=编辑文本文件
  Comment[zh_TW]=編輯文字檔
 -TryExec=gvim
@@ -133,6 +132,7 @@
 +Exec=gvim.motif -f %F
  Terminal=false
  Type=Application
+ Keywords=Text;editor;
  Icon=gvim
 -Categories=Utility;TextEditor;
 +Categories=Motif;TextEditor;
diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 7d858c1..f0aa1b0 100644
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -10,7 +10,7 @@
  " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
  " let &guioptions = substitute(&guioptions, "t", "", "g")
  
-@@ -42,13 +45,13 @@
+@@ -46,13 +46,13 @@ map Q gq
  inoremap <C-U> <C-G>u<C-U>
  
  " In many terminal emulators the mouse works just fine, thus enable it.
@@ -21,13 +21,13 @@
 +"  set mouse=a
 +"endif
  
- " Switch syntax highlighting on, when the terminal has colors
- " Also switch on highlighting the last used search pattern.
+ " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).
 -if &t_Co > 2 || has("gui_running")
 +if (&t_Co > 2 || has("gui_running")) && filereadable($VIMRUNTIME."/syntax/syntax.vim")
    syntax on
-   set hlsearch
- endif
+ 
+   " Also switch on highlighting the last used search pattern.
 @@ -93,10 +93,18 @@
  " Convenient command to see the difference between the current buffer and the
  " file it was loaded from, thus the changes you made.
diff --git a/vim-visual.patch b/vim-visual.patch
deleted file mode 100644
index 1669720..0000000
--- a/vim-visual.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vim60z/src/screen.c~	Tue Apr 10 15:47:51 2001
-+++ vim60z/src/screen.c	Tue Apr 10 15:49:00 2001
-@@ -2328,7 +2328,7 @@
- 
- #ifndef MSDOS
- 	/* Check if the character under the cursor should not be inverted */
--	if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin
-+	if (!highlight_match && *T_VI == NUL && lnum == curwin->w_cursor.lnum && wp == curwin
- # ifdef FEAT_GUI
- 		&& !gui.in_use
- # endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/a39abb0052109adcb0db5fe05997bdac8e36ca75