diff --git a/7.4.899 b/7.4.899
deleted file mode 100644
index df1534f..0000000
--- a/7.4.899
+++ /dev/null
@@ -1,140 +0,0 @@
-To: vim_dev@googlegroups.com
-Subject: Patch 7.4.899
-Fcc: outbox
-From: Bram Moolenaar <Bram@moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-------------
-
-Patch 7.4.899
-Problem:    README file is not optimal.
-Solution:   Move buttons, update some text. (closes #460)
-Files:      README.txt, README.md
-
-
-*** ../vim-7.4.898/README.txt	2013-08-10 13:24:51.000000000 +0200
---- README.txt	2015-10-25 13:50:34.962876572 +0100
-***************
-*** 1,7 ****
-  README.txt for version 7.4 of Vim: Vi IMproved.
-  
-  
-! WHAT IS VIM
-  
-  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
-  have been added: multi-level undo, syntax highlighting, command line history,
---- 1,7 ----
-  README.txt for version 7.4 of Vim: Vi IMproved.
-  
-  
-! WHAT IS VIM?
-  
-  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
-  have been added: multi-level undo, syntax highlighting, command line history,
-***************
-*** 21,26 ****
---- 21,30 ----
-  
-  DISTRIBUTION
-  
-+ You can often use your favorite package manager to install Vim.  On Mac and
-+ Linux a small version of Vim is pre-installed, you still need to install Vim
-+ if you want more features.
-+ 
-  There are separate distributions for Unix, PC, Amiga and some other systems.
-  This README.txt file comes with the runtime archive.  It includes the
-  documentation, syntax files and other files that are used at runtime.  To run
-***************
-*** 94,101 ****
-  The latest news about Vim can be found on the Vim home page:
-  	http://www.vim.org/
-  
-! If you have problems, have a look at the Vim FAQ:
-! 	http://vimdoc.sf.net/vimfaq.html
-  
-  If you still have problems or any other questions, use one of the mailing
-  lists to discuss them with Vim users and developers:
---- 98,106 ----
-  The latest news about Vim can be found on the Vim home page:
-  	http://www.vim.org/
-  
-! If you have problems, have a look at the Vim documentation or tips:
-! 	http://www.vim.org/docs.php
-! 	http://vim.wikia.com/wiki/Vim_Tips_Wiki
-  
-  If you still have problems or any other questions, use one of the mailing
-  lists to discuss them with Vim users and developers:
-***************
-*** 110,115 ****
-  Send any other comments, patches, flowers and suggestions to:
-  
-  	Bram Moolenaar		E-mail:	Bram@vim.org
-- 	Finsterruetihof 1
-- 	8134 Adliswil
-- 	Switzerland
---- 115,117 ----
-*** ../vim-7.4.898/README.md	2015-09-25 17:50:16.350057915 +0200
---- README.md	2015-10-25 13:50:31.734914034 +0100
-***************
-*** 1,7 ****
-  `README.md` for version 7.4 of Vim: Vi IMproved.
-  
-  
-! ## What is VIM ##
-  
-  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
-  have been added: multi-level undo, syntax highlighting, command line history,
---- 1,9 ----
-  `README.md` for version 7.4 of Vim: Vi IMproved.
-+ [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
-+ [![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
-  
-  
-! ## What is Vim? ##
-  
-  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
-  have been added: multi-level undo, syntax highlighting, command line history,
-***************
-*** 21,26 ****
---- 23,32 ----
-  
-  ## Distribution ##
-  
-+ You can often use your favorite package manager to install Vim.  On Mac and
-+ Linux a small version of Vim is pre-installed, you still need to install Vim
-+ if you want more features.
-+ 
-  There are separate distributions for Unix, PC, Amiga and some other systems.
-  This `README.md` file comes with the runtime archive.  It includes the
-  documentation, syntax files and other files that are used at runtime.  To run
-***************
-*** 29,37 ****
-  want or must compile it yourself.  Check http://www.vim.org/download.php for
-  an overview of currently available distributions.
-  
-- [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
-- [![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
-- 
-  
-  ## Documentation ##
-  
---- 35,40 ----
-*** ../vim-7.4.898/src/version.c	2015-10-13 20:55:46.058715228 +0200
---- src/version.c	2015-10-25 13:52:02.669858690 +0100
-***************
-*** 743,744 ****
---- 743,746 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     899,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
-
- /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
-///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
-\\\  an exciting new programming language -- http://www.Zimbu.org        ///
- \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/Changelog.rpm b/Changelog.rpm
deleted file mode 100644
index 86e85af..0000000
--- a/Changelog.rpm
+++ /dev/null
@@ -1,430 +0,0 @@
-* Tue Aug 28 2012 Karsten Hopp <karsten@redhat.com> 7.3.638-1
-- patchlevel 638
-
-* Mon Aug 06 2012 Karsten Hopp <karsten@redhat.com> 2:7.3.622-2
-- add epoch to spec.vim and automatic changelog entries
-
-* Mon Aug 06 2012 Karsten Hopp <karsten@redhat.com> 7.3.622-1
-- patchlevel 622
-
-* Mon Aug 06 2012 Karsten Hopp <karsten@redhat.com> 7.3.604-1
-- drop vim-6.1-rh3.patch, (bz #754801)
-
-* Wed Jul 18 2012 Karsten Hopp <karsten@redhat.com> 7.3.604-1
-- patchlevel 604
-
-* Wed Jul 11 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.594-2
-- Perl 5.16 rebuild
-
-* Tue Jul 10 2012 Karsten Hopp <karsten@redhat.com> 7.3.594-1
-- patchlevel 594
-
-* Tue Jul 10 2012 Karsten Hopp <karsten@redhat.com> 7.3.592-1
-- patchlevel 592
-
-* Mon Jul 09 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.584-2
-- Perl 5.16 rebuild
-
-* Mon Jul 02 2012 Karsten Hopp <karsten@redhat.com> 7.3.584-1
-- patchlevel 584
-
-* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.556-2
-- Perl 5.16 rebuild
-
-* Mon Jun 18 2012 Karsten Hopp <karsten@redhat.com> 7.3.556-1
-- patchlevel 556
-
-* Mon Jun 11 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.515-2
-- Perl 5.16 rebuild
-
-* Mon May 21 2012 Karsten Hopp <karsten@redhat.com> 7.3.515-1
-- enable highlighting for older log files (#816848)
-
-* Tue May 08 2012 Karsten Hopp <karsten@redhat.com> 7.3.515-1
-- patchlevel 515
-
-* Fri Mar 16 2012 Karsten Hopp <karsten@redhat.com> 7.3.471-1
-- patchlevel 471
-
-* Mon Feb 13 2012 Karsten Hopp <karsten@redhat.com> 7.3.444-1
-- patchlevel 444
-
-* Tue Feb 07 2012 Karsten Hopp <karsten@redhat.com> 7.3.434-1
-- patchlevel 434
-
-* Tue Feb 07 2012 Karsten Hopp <karsten@redhat.com> 7.3.393-3
-- update spec file template, bugzilla 736774
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 7.3.393-3
-- rebuild against the new ruby library
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 7.3.393-2
-- install everything in /usr
-  https://fedoraproject.org/wiki/Features/UsrMove
-
-* Thu Jan 05 2012 Karsten Hopp <karsten@redhat.com> 7.3.393-1
-- patchlevel 393
-- fix boolean key 'Terminal' in gvim.desktop
-
-* Fri Dec 23 2011 Karsten Hopp <karsten@redhat.com> 7.3.386-1
-- patchlevel 386
-
-* Mon Sep 26 2011 Karsten Hopp <karsten@redhat.com> 7.3.322-1
-- patchlevel 322
-
-* Wed Sep 21 2011 Karsten Hopp <karsten@redhat.com> 7.3.315-1
-- patchlevel 315
-
-* Mon Aug 29 2011 Karsten Hopp <karsten@redhat.com> 7.3.289-1
-- patchlevel 289
-
-* Mon Aug 29 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-4
-- Remove old patched files. (Ricky Zhou <ricky@fedoraproject.org>)
-  (bugzilla #709456)
-
-* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2:7.3.244-3
-- Perl mass rebuild
-
-* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2:7.3.244-2
-- Perl mass rebuild
-
-* Mon Jul 11 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-1
-- patchlevel 244
-
-* Tue Jun 14 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2:7.3.206-3
-- Perl mass rebuild
-
-* Tue May 31 2011 Ville Skyttä <ville.skytta@iki.fi> - 2:7.3.206-2
-- Own the /usr/share/vim/vim73 dir.
-
-* Mon May 30 2011 Karsten Hopp <karsten@redhat.com> 7.3.206-1
-- drop xxd-locale patch
-- update to patchlevel 206
-
-* Wed May 11 2011 Karsten Hopp <karsten@redhat.com> 7.3.189-1
-- patchlevel 189
-
-* Wed Mar 16 2011 Karsten Hopp <karsten@redhat.com> 7.3.138-1
-- patchlevel 138
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.3.107-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jan 24 2011 Karsten Hopp <karsten@redhat.com> 7.3.107-1
-- patchlevel 107
-
-* Mon Jan 10 2011 Karsten Hopp <karsten@redhat.com> 7.3.099-1
-- patchlevel 099
-
-* Mon Jan 03 2011 Karsten Hopp <karsten@redhat.com> 7.3.094-1
-- patchlevel 094
-
-* Thu Dec 09 2010 Karsten Hopp <karsten@redhat.com> 7.3.081-1
-- patchlevel 081
-
-* Wed Dec 08 2010 Karsten Hopp <karsten@redhat.com> 7.3.080-1
-- patchlevel 080
-
-* Fri Dec 03 2010 Karsten Hopp <karsten@redhat.com> 7.3.075-1
-- patchlevel 075
-
-* Thu Dec 02 2010 Karsten Hopp <karsten@redhat.com> 7.3.073-1
-- patchlevel 073
-
-* Thu Nov 25 2010 Karsten Hopp <karsten@redhat.com> 7.3.069-1
-- patchlevel 069
-
-* Wed Nov 24 2010 Karsten Hopp <karsten@redhat.com> 7.3.068-1
-- patchlevel 068
-
-* Wed Nov 24 2010 Karsten Hopp <karsten@redhat.com> 7.3.063-1
-- patchlevel 063
-
-* Wed Nov 17 2010 Karsten Hopp <karsten@redhat.com> 7.3.062-1
-- patchlevel 062
-
-* Tue Nov 16 2010 Karsten Hopp <karsten@redhat.com> 7.3.061-1
-- patchlevel 061
-
-* Tue Nov 16 2010 Karsten Hopp <karsten@redhat.com> 7.3.056-1
-- patchlevel 056
-
-* Thu Nov 11 2010 Karsten Hopp <karsten@redhat.com> 7.3.055-1
-- patchlevel 055
-
-* Wed Nov 10 2010 Karsten Hopp <karsten@redhat.com> 7.3.051-1
-- patchlevel 051
-
-* Thu Nov 04 2010 Karsten Hopp <karsten@redhat.com> 7.3.050-1
-- patchlevel 050
-
-* Thu Nov 04 2010 Karsten Hopp <karsten@redhat.com> 7.3.048-1
-- patchlevel 048
-
-* Thu Oct 28 2010 Karsten Hopp <karsten@redhat.com> 7.3.047-1
-- patchlevel 047
-
-* Wed Oct 27 2010 Karsten Hopp <karsten@redhat.com> 7.3.046-1
-- patchlevel 046
-
-* Wed Oct 27 2010 Karsten Hopp <karsten@redhat.com> 7.3.039-1
-- patchlevel 039
-
-* Sun Oct 24 2010 Karsten Hopp <karsten@redhat.com> 7.3.035-1
-- patchlevel 035
-
-* Sat Oct 23 2010 Karsten Hopp <karsten@redhat.com> 7.3.034-1
-- patchlevel 034
-
-* Sat Oct 23 2010 Karsten Hopp <karsten@redhat.com> 7.3.033-1
-- patchlevel 033
-
-* Thu Oct 21 2010 Karsten Hopp <karsten@redhat.com> 7.3.032-1
-- patchlevel 032
-
-* Wed Oct 20 2010 Karsten Hopp <karsten@redhat.com> 7.3.031-1
-- patchlevel 031
-
-* Sat Oct 16 2010 Karsten Hopp <karsten@redhat.com> 7.3.029-1
-- patchlevel 029
-
-* Fri Oct 15 2010 Karsten Hopp <karsten@redhat.com> 7.3.028-1
-- patchlevel 028
-
-* Thu Oct 14 2010 Karsten Hopp <karsten@redhat.com> 7.3.027-1
-- patchlevel 027
-
-* Wed Oct 13 2010 Karsten Hopp <karsten@redhat.com> 7.3.026-1
-- patchlevel 026
-
-* Sun Oct 10 2010 Karsten Hopp <karsten@redhat.com> 7.3.021-1
-- patchlevel 021
-
-* Sat Oct 09 2010 Karsten Hopp <karsten@redhat.com> 7.3.020-1
-- patchlevel 020
-
-* Fri Oct 01 2010 Karsten Hopp <karsten@redhat.com> 7.3.019-1
-- patchlevel 019
-
-* Thu Sep 30 2010 Karsten Hopp <karsten@redhat.com> 7.3.018-1
-- patchlevel 018
-
-* Thu Sep 30 2010 Karsten Hopp <karsten@redhat.com> 7.3.011-3
-- add filesystem subpackage (#628293)
-
-* Wed Sep 29 2010 jkeating - 2:7.3.011-2
-- Rebuilt for gcc bug 634757
-
-* Wed Sep 22 2010 Karsten Hopp <karsten@redhat.com> 7.3.011-1
-- update to VIM 7.3 patchlevel 011
-
-# vim:nrformats-=octal
-* Tue Jul 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 7.2.446-2
-- Rebuild against python 2.7
-
-* Tue Jul 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.446-1
-- patchlevel 446
-
-* Thu Jul 08 2010 Karsten Hopp <karsten@redhat.com> 7.2.445-1
-- patchlevel 445
-
-* Wed Jun 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-2
-- rebuild with perl-5.12
-
-* Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-1
-- patchlevel 444
-
-* Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.443-1
-- patchlevel 443
-
-* Sat Jun 05 2010 Karsten Hopp <karsten@redhat.com> 7.2.442-1
-- patchlevel 442
-
-* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 2:7.2.441-2
-- Mass rebuild with perl-5.12.0
-
-* Sun May 30 2010 Karsten Hopp <karsten@redhat.com> 7.2.441-1
-- patchlevel 441
-
-* Sat May 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.440-1
-- patchlevel 440
-
-* Wed May 26 2010 Karsten Hopp <karsten@redhat.com> 7.2.438-1
-- patchlevel 438
-
-* Sat May 22 2010 Karsten Hopp <karsten@redhat.com> 7.2.437-1
-- patchlevel 437
-
-* Sun May 16 2010 Karsten Hopp <karsten@redhat.com> 7.2.436-1
-- patchlevel 436
-
-* Sat May 15 2010 Karsten Hopp <karsten@redhat.com> 7.2.433-1
-- patchlevel 433
-
-* Fri May 14 2010 Karsten Hopp <karsten@redhat.com> 7.2.427-1
-- patchlevel 427
-
-* Thu May 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.422-1
-- patchlevel 422
-
-* Fri May 07 2010 Karsten Hopp <karsten@redhat.com> 7.2.416-1
-- patchlevel 416
-
-* Tue Apr 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-2
-- fix rvim manpage (#583180)
-
-* Wed Mar 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-1
-- patchlevel 411
-
-* Tue Mar 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.410-1
-- patchlevel 410
-
-* Sat Mar 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.403-1
-- patchlevel 403
-
-* Thu Mar 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.402-1
-- patchlevel 402
-
-* Wed Mar 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.399-1
-- patchlevel 399
-
-* Wed Mar 10 2010 Karsten Hopp <karsten@redhat.com> 7.2.394-1
-- patchlevel 394
-
-* Wed Mar 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.385-1
-- patchlevel 385
-
-* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.384-1
-- patchlevel 384
-
-* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.381-1
-- patchlevel 381
-
-* Sat Feb 27 2010 Karsten Hopp <karsten@redhat.com> 7.2.377-1
-- patchlevel 377
-
-* Wed Feb 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.376-1
-- patchlevel 376
-
-* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.368-1
-- patchlevel 368
-
-* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.367-1
-- patchlevel 367
-
-* Wed Feb 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.365-1
-- patchlevel 365
-
-* Fri Feb 12 2010 Karsten Hopp <karsten@redhat.com> 7.2.359-1
-- patchlevel 359
-
-* Thu Feb 11 2010 Karsten Hopp <karsten@redhat.com> 7.2.357-1
-- patchlevel 357
-
-* Thu Feb 04 2010 Karsten Hopp <karsten@redhat.com> 7.2.356-1
-- patchlevel 356
-
-* Wed Feb 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.354-1
-- patchlevel 354
-
-* Fri Jan 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.351-1
-- patchlevel 351
-
-* Thu Jan 28 2010 Karsten Hopp <karsten@redhat.com> 7.2.350-1
-- patchlevel 350
-
-* Mon Dec  7 2009 Stepan Kasal <skasal@redhat.com> - 2:7.2.315-2
-- rebuild against perl 5.10.1
-
-* Wed Dec 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.315-1
-- patchlevel 315
-- fix vimrc location in man page (#456992)
-- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
-- Buildrequire ruby, ruby-devel (#503872)
-- Remove check for static gravity (#510307)
-- sort tags file (#517725)
-- use one gvim to open multiple file selections from nautilus (#519265)
-- use elinks -source instead of elinks -dump (#518791)
-- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
-
-* Mon Nov 09 2009 Karsten Hopp <karsten@redhat.com> 7.2.284-1
-- patchlevel 284
-
-* Thu Aug 20 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-3
-- change range of system ids in /etc/profile.d/vim/* (#518555)
-
-* Mon Aug 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-2
-- add fix for glibc fortify segfault (#514717, Adam Tkac)
-
-* Sat Aug 01 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-1
-- add 97 upstream patches to get to patchlevel 245
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.2.148-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Mar 27 2009 Karsten Hopp <karsten@redhat.com> 7.2.148-1
-- patchlevel 148, fixes #461417
-
-* Tue Mar 10 2009 Karsten Hopp <karsten@redhat.com> 7.2.132-1
-- patchlevel 132, fixes accesses to freed memory
-
-* Wed Mar 04 2009 Karsten Hopp <karsten@redhat.com> 7.2.131-1
-- patchlevel 131
-
-* Tue Feb 24 2009 Karsten Hopp <karsten@redhat.com> 7.2.127-1
-- patchlevel 127
-
-* Mon Feb 23 2009 Karsten Hopp <karsten@redhat.com> 7.2.124-1
-- patchlevel 124
-
-* Mon Jan 26 2009 Karsten Hopp <karsten@redhat.com> 7.2.088-1
-- patchlevel 88
-
-* Thu Jan 08 2009 Karsten Hopp <karsten@redhat.com> 7.2.079-2
-- patchlevel 79
-
-* Thu Dec 04 2008 Jesse Keating <jkeating@redhat.com> - 7.2.060-2
-- Rebuild for new python.
-
-* Mon Dec 01 2008 Karsten Hopp <karsten@redhat.com> 7.2.060-1
-- patchlevel 60
-
-* Mon Nov 10 2008 Karsten Hopp <karsten@redhat.com> 7.2.032-1
-- patchlevel 32
-
-* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-2
-- add more /usr/share/vim/vimfiles directories (#444387)
-
-* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-1
-- patchlevel 26
-- own some directories in /usr/share/vim/vimfiles (#469491)
-
-* Tue Oct 21 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-2
-- re-enable clean
-
-* Mon Oct 20 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-1
-- patchlevel 25
-- add Categories tag to desktop file (#226526)
-- add requirement on hicolor-icon-theme to vim-X11 (#226526)
-- drop Amiga info files (#226526)
-- remove non-utf8 man pages (#226526)
-- drop Application from categories (#226526)
-
-* Tue Sep 30 2008 Karsten Hopp <karsten@redhat.com> 7.2.022-1
-- patchlevel 22
-
-* Mon Sep 08 2008 Karsten Hopp <karsten@redhat.com> 7.2.013-1
-- patchlevel 13
-
-* Mon Aug 25 2008 Karsten Hopp <karsten@redhat.com> 7.2.006-1
-- patchlevel 6
-
-* Mon Aug 18 2008 Karsten Hopp <karsten@redhat.com> 7.2.002-1
-- patchlevel 2
-- fix specfile template (#446070)
-- old specfile changelog moved to Changelog.rpm
-
-* Fri Aug 14 2008 Karsten Hopp <karsten@redhat.com> 7.2.000-1
-- vim 7.2
-- drop 330 patches
-
diff --git a/ftplugin-spec.vim b/ftplugin-spec.vim
deleted file mode 100644
index 2a961f8..0000000
--- a/ftplugin-spec.vim
+++ /dev/null
@@ -1,210 +0,0 @@
-" Plugin to update the %changelog section of RPM spec files
-" Filename: spec.vim
-" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com
-" Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014)
-" Last Change: Mon Jun 01 21:15 MSK 2015 Igor Gnatenko
-
-if exists("b:did_ftplugin")
-	finish
-endif
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-if !exists("no_plugin_maps") && !exists("no_spec_maps")
-	if !hasmapto("<Plug>SpecChangelog")
-		map <buffer> <LocalLeader>c <Plug>SpecChangelog
-	endif
-endif
-
-if !hasmapto("call <SID>SpecChangelog(\"\")<CR>")
-       noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR>
-endif
-
-if !exists("*s:GetRelVer")
-	function! s:GetRelVer()
-		if has('python')
-python << PYEND
-import sys, datetime, shutil, tempfile
-import vim
-
-try:
-    import rpm
-except ImportError:
-    pass
-else:
-    specfile = vim.current.buffer.name
-    if specfile:
-        rpm.delMacro("dist")
-        spec = rpm.spec(specfile)
-        headers = spec.sourceHeader
-        version = headers["Version"]
-        release = headers["Release"]
-        vim.command("let ver = " + version)
-        vim.command("let rel = " + release)
-PYEND
-		endif
-	endfunction
-endif
-
-if !exists("*s:SpecChangelog")
-	function s:SpecChangelog(format)
-		if strlen(a:format) == 0
-			if !exists("g:spec_chglog_format")
-				let email = input("Name <email address>: ")
-				let g:spec_chglog_format = "%a %b %d %Y " . l:email
-				echo "\r"
-			endif
-			let format = g:spec_chglog_format
-		else
-			if !exists("g:spec_chglog_format")
-				let g:spec_chglog_format = a:format
-			endif
-			let format = a:format
-		endif
-		let line = 0
-		let name = ""
-		let ver = ""
-		let rel = ""
-		let nameline = -1
-		let verline = -1
-		let relline = -1
-		let chgline = -1
-		while (line <= line("$"))
-			let linestr = getline(line)
-			if (name == "" && linestr =~? '^Name:')
-				let nameline = line
-				let name = substitute(strpart(linestr,5), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (ver == "" && linestr =~? '^Version:')
-				let verline = line
-				let ver = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (rel == "" && linestr =~? '^Release:')
-				let relline = line
-				let rel = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (linestr =~? '^%changelog')
-				let chgline = line
-				execute line
-				break
-			endif
-			let line = line+1
-		endwhile
-		if (nameline != -1 && verline != -1 && relline != -1)
-			let include_release_info = exists("g:spec_chglog_release_info")
-			let name = s:ParseRpmVars(name, nameline)
-			let ver = s:ParseRpmVars(ver, verline)
-			let rel = s:ParseRpmVars(rel, relline)
-		else
-			let include_release_info = 0
-		endif
-
-		call s:GetRelVer()
-
-		if (chgline == -1)
-			let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3)
-			if (option == 1)
-				call append(line("$"),"")
-				call append(line("$"),"%changelog")
-				execute line("$")
-				let chgline = line(".")
-			elseif (option == 2)
-				call append(line("."),"%changelog")
-				normal j
-				chgline = line(".")
-			endif
-		endif
-		if (chgline != -1)
-			let tmptime = v:lc_time
-			language time C
-			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
-			execute "language time" tmptime
-			let release_info = "+ ".name."-".ver."-".rel
-			let wrong_format = 0
-			let wrong_release = 0
-			let insert_line = 0
-			if (getline(chgline+1) != parsed_format)
-				let wrong_format = 1
-			endif
-			if (include_release_info && getline(chgline+2) != release_info)
-				let wrong_release = 1
-			endif
-			if (wrong_format || wrong_release)
-				if (include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release"))
-					let option = confirm("Increase release? ","&Yes\n&No",1)
-					if (option == 1)
-						execute relline
-						normal 

-						let rel = substitute(strpart(getline(relline),8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-						let release_info = "+ ".name."-".ver."-".rel
-					endif
-				endif
-				let n = 0
-				call append(chgline+n, parsed_format)
-				if include_release_info
-					let n = n + 1
-					call append(chgline+n, release_info)
-				endif
-				let n = n + 1
-				call append(chgline+n,"- ")
-				let n = n + 1
-				call append(chgline+n,"")
-				let insert_line = chgline+n
-			else
-				let line = chgline
-				if !exists("g:spec_chglog_prepend")
-					while !(getline(line+2) =~ '^\( *\|\*.*\)$')
-						let line = line+1
-					endwhile
-				endif
-				call append(line+1,"- ")
-				let insert_line = line+2
-			endif
-			execute insert_line
-			startinsert!
-		endif
-	endfunction
-endif
-
-if !exists("*s:ParseRpmVars")
-    function s:ParseRpmVars(str, strline)
-	let end = -1
-	let ret = ""
-	while (1)
-		let start = match(a:str, "\%{", end+1)
-		if (start == -1)
-			let ret = ret . strpart(a:str, end+1)
-			break
-		endif
-		let ret = ret . strpart(a:str, end+1, start-(end+1))
-		let end = match(a:str, "}", start)
-		if (end == -1)
-			let ret = ret . strpart(a:str, start)
-			break
-		endif
-		let varname = strpart(a:str, start+2, end-(start+2))
-		execute a:strline
-		let definestr = "^[ \t]*%(?:global|define)[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$"
-		let linenum = search(definestr, "bW")
-		if (linenum != -1)
-			let ret = ret .  substitute(getline(linenum), definestr, "\\1", "")
-		else
-			let ret = ret . strpart(str, start, end+1-start)
-		endif
-	endwhile
-	return ret
-    endfunction
-endif
-
-" The following lines, along with the macros/matchit.vim plugin,
-" make it easy to navigate the different sections of a spec file
-" with the % key (thanks to Max Ischenko).
-
-let b:match_ignorecase = 0
-let b:match_words =
-  \ '^Name:^%description:^%clean:^%(?:auto)?setup:^%build:^%install:^%files:' .
-  \ '^%package:^%preun:^%postun:^%changelog'
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"
diff --git a/syntax-spec.vim b/syntax-spec.vim
deleted file mode 100644
index 9952bd2..0000000
--- a/syntax-spec.vim
+++ /dev/null
@@ -1,236 +0,0 @@
-" Filename:    spec.vim
-" Purpose:     Vim syntax file
-" Language:    SPEC: Build/install scripts for Linux RPM packages
-" Maintainer:  Igor Gnatenko i.gnatenko.brain@gmail.com
-" Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
-" Last Change: Sat Apr 9 15:30 2016 Filip Szymański
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn sync minlines=1000
-
-syn match specSpecialChar contained '[][!$()\\|>^;:{}]'
-syn match specColon       contained ':'
-syn match specPercent     contained '%'
-
-syn match specVariables   contained '\$\h\w*' contains=specSpecialVariablesNames,specSpecialChar
-syn match specVariables   contained '\${\w*}' contains=specSpecialVariablesNames,specSpecialChar
-
-syn match specMacroIdentifier contained '%\h\w*' contains=specMacroNameLocal,specMacroNameOther,specPercent
-syn match specMacroIdentifier contained '%{\w*}' contains=specMacroNameLocal,specMacroNameOther,specPercent,specSpecialChar
-
-syn match specSpecialVariables contained '\$[0-9]\|\${[0-9]}'
-syn match specCommandOpts      contained '\s\(-\w\+\|--\w[a-zA-Z_-]\+\)'ms=s+1
-syn match specComment '^\s*#.*$'
-
-
-syn case match
-
-
-"matches with no highlight
-syn match specNoNumberHilite 'X11\|X11R6\|[a-zA-Z]*\.\d\|[a-zA-Z][-/]\d'
-syn match specManpageFile '[a-zA-Z]\.1'
-
-"Day, Month and most used license acronyms
-syn keyword specLicense contained GPL LGPL BSD MIT GNU
-syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
-syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
-syn keyword specMonth   contained January February March April May June July August September October November December
-
-"#, @, www
-syn match specNumber '\(^-\=\|[ \t]-\=\|-\)[0-9.-]*[0-9]'
-syn match specEmail contained "<\=\<[A-Za-z0-9_.-]\+@\([A-Za-z0-9_-]\+\.\)\+[A-Za-z]\+\>>\="
-syn match specURL      contained '\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#-]\+\>'
-syn match specURLMacro contained '\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#%{}-]\+\>' contains=specMacroIdentifier
-
-"TODO take specSpecialVariables out of the cluster for the sh* contains (ALLBUT)
-"Special system directories
-syn match specListedFilesPrefix contained '/\(usr\|local\|opt\|X11R6\|X11\)/'me=e-1
-syn match specListedFilesBin    contained '/s\=bin/'me=e-1
-syn match specListedFilesLib    contained '/\(lib\|include\)/'me=e-1
-syn match specListedFilesDoc    contained '/\(man\d*\|doc\|info\)\>'
-syn match specListedFilesEtc    contained '/etc/'me=e-1
-syn match specListedFilesShare  contained '/share/'me=e-1
-syn cluster specListedFiles contains=specListedFilesBin,specListedFilesLib,specListedFilesDoc,specListedFilesEtc,specListedFilesShare,specListedFilesPrefix,specVariables,specSpecialChar
-
-"specComands
-syn match   specConfigure  contained '\./configure'
-syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
-syn keyword specCommandSpecial contained root
-syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
-syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
-
-"frequently used rpm env vars
-syn keyword specSpecialVariablesNames contained RPM_BUILD_ROOT RPM_BUILD_DIR RPM_SOURCE_DIR RPM_OPT_FLAGS LDFLAGS CC CC_FLAGS CPPNAME CFLAGS CXX CXXFLAGS CPPFLAGS
-
-"valid macro names from /usr/lib/rpm/macros
-syn keyword specMacroNameOther contained buildroot buildsubdir distribution disturl ix86 name nil optflags perl_sitearch release requires_eq vendor version
-syn match   specMacroNameOther contained '\<\(PATCH\|SOURCE\)\d*\>'
-
-"valid _macro names from /usr/lib/rpm/macros
-syn keyword specMacroNameLocal contained _arch _binary_payload _bindir _build _build_alias _build_cpu _builddir _build_os _buildshell _buildsubdir _build_vendor _bzip2bin _datadir _dbpath _dbpath_rebuild _defaultdocdir _docdir _excludedocs _exec_prefix _fixgroup _fixowner _fixperms _ftpport _ftpproxy _gpg_path _gzipbin _host _host_alias _host_cpu _host_os _host_vendor _httpport _httpproxy _includedir _infodir _install_langs _install_script_path _instchangelog _langpatt _lib _libdir _libexecdir _localstatedir _mandir _netsharedpath _oldincludedir _os _pgpbin _pgp_path _prefix _preScriptEnvironment _provides _rpmdir _rpmfilename _sbindir _sharedstatedir _signature _sourcedir _source_payload _specdir _srcrpmdir _sysconfdir _target _target_alias _target_cpu _target_os _target_platform _target_vendor _timecheck _tmppath _topdir _usr _usrsrc _var _vendor
-
-
-"------------------------------------------------------------------------------
-" here's is all the spec sections definitions: PreAmble, Description, Package,
-"   Scripts, Files and Changelog
-
-"One line macros - valid in all ScriptAreas
-"tip: remember do include new items on specScriptArea's skip section
-syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|global\|patch\d*\|setup\|autosetup\|autopatch\|configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier
-syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\)}' end='$' contains=specCommandOpts,specMacroIdentifier
-
-"%% Files Section %%
-"TODO %config valid parameters: missingok\|noreplace
-"TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
-syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
-"tip: remember to include new itens in specFilesArea above
-syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>'
-
-"valid options for certain section headers
-syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
-syn match specPackageOpts     contained    '\s-n\s*\w'ms=s+1,me=e-1
-syn match specFilesOpts       contained    '\s-f\s*\w'ms=s+1,me=e-1
-
-
-syn case ignore
-
-
-"%% PreAmble Section %%
-"Copyright and Serial were deprecated by License and Epoch
-syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-
-"%% Description Section %%
-syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
-
-"%% Package Section %%
-syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
-
-"%% Scripts Section %%
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
-
-"%% Changelog Section %%
-syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
-
-
-
-"------------------------------------------------------------------------------
-"here's the shell syntax for all the Script Sections
-
-
-syn case match
-
-
-"sh-like comment stile, only valid in script part
-syn match shComment contained '#.*$'
-
-syn region shQuote1 contained matchgroup=shQuoteDelim start=+'+ skip=+\\'+ end=+'+ contains=specMacroIdentifier
-syn region shQuote2 contained matchgroup=shQuoteDelim start=+"+ skip=+\\"+ end=+"+ contains=specVariables,specMacroIdentifier
-
-syn match shOperator contained '[><|!&;]\|[!=]='
-syn region shDo transparent matchgroup=specBlock start="\<do\>" end="\<done\>" contains=ALLBUT,shFunction,shDoError,shCase,specPreAmble,@specListedFiles
-
-syn region specIf  matchgroup=specBlock start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|%else"  end='%endif'  contains=ALLBUT, specIfError, shCase
-
-syn region  shIf transparent matchgroup=specBlock start="\<if\>" end="\<fi\>" contains=ALLBUT,shFunction,shIfError,shCase,@specListedFiles
-
-syn region  shFor  matchgroup=specBlock start="\<for\>" end="\<in\>" contains=ALLBUT,shFunction,shInError,shCase,@specListedFiles
-
-syn region shCaseEsac transparent matchgroup=specBlock start="\<case\>" matchgroup=NONE end="\<in\>"me=s-1 contains=ALLBUT,shFunction,shCaseError,@specListedFiles nextgroup=shCaseEsac
-syn region shCaseEsac matchgroup=specBlock start="\<in\>" end="\<esac\>" contains=ALLBUT,shFunction,shCaseError,@specListedFilesBin
-syn region shCase matchgroup=specBlock contained start=")"  end=";;" contains=ALLBUT,shFunction,shCaseError,shCase,@specListedFiles
-
-syn sync match shDoSync       grouphere  shDo       "\<do\>"
-syn sync match shDoSync       groupthere shDo       "\<done\>"
-syn sync match shIfSync       grouphere  shIf       "\<if\>"
-syn sync match shIfSync       groupthere shIf       "\<fi\>"
-syn sync match specIfSync     grouphere  specIf     "%ifarch\|%ifos\|%ifnos"
-syn sync match specIfSync     groupthere specIf     "%endIf"
-syn sync match shForSync      grouphere  shFor      "\<for\>"
-syn sync match shForSync      groupthere shFor      "\<in\>"
-syn sync match shCaseEsacSync grouphere  shCaseEsac "\<case\>"
-syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_spec_syntax_inits")
-  if version < 508
-    let did_spec_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  "main types color definitions
-  HiLink specSection			Structure
-  HiLink specSectionMacro		Macro
-  HiLink specWWWlink			PreProc
-  HiLink specOpts			Operator
-
-  "yes, it's ugly, but white is sooo cool
-  if &background == "dark"
-    hi def specGlobalMacro		ctermfg=white
-  else
-    HiLink specGlobalMacro		Identifier
-  endif
-
-  "sh colors
-  HiLink shComment			Comment
-  HiLink shIf				Statement
-  HiLink shOperator			Special
-  HiLink shQuote1			String
-  HiLink shQuote2			String
-  HiLink shQuoteDelim			Statement
-
-  "spec colors
-  HiLink specBlock			Function
-  HiLink specColon			Special
-  HiLink specCommand			Statement
-  HiLink specCommandOpts		specOpts
-  HiLink specCommandSpecial		Special
-  HiLink specComment			Comment
-  HiLink specConfigure			specCommand
-  HiLink specDate			String
-  HiLink specDescriptionOpts		specOpts
-  HiLink specEmail			specWWWlink
-  HiLink specError			Error
-  HiLink specFilesDirective		specSectionMacro
-  HiLink specFilesOpts			specOpts
-  HiLink specLicense			String
-  HiLink specMacroNameLocal		specGlobalMacro
-  HiLink specMacroNameOther		specGlobalMacro
-  HiLink specManpageFile		NONE
-  HiLink specMonth			specDate
-  HiLink specNoNumberHilite		NONE
-  HiLink specNumber			Number
-  HiLink specPackageOpts		specOpts
-  HiLink specPercent			Special
-  HiLink specSpecialChar		Special
-  HiLink specSpecialVariables		specGlobalMacro
-  HiLink specSpecialVariablesNames	specGlobalMacro
-  HiLink specTarCommand			specCommand
-  HiLink specURL			specWWWlink
-  HiLink specURLMacro			specWWWlink
-  HiLink specVariables			Identifier
-  HiLink specWeekday			specDate
-  HiLink specListedFilesBin		Statement
-  HiLink specListedFilesDoc		Statement
-  HiLink specListedFilesEtc		Statement
-  HiLink specListedFilesLib		Statement
-  HiLink specListedFilesPrefix		Statement
-  HiLink specListedFilesShare		Statement
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "spec"
-
-" vim: ts=8
diff --git a/vi_help.txt b/vi_help.txt
deleted file mode 100644
index 23e5fe9..0000000
--- a/vi_help.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-*vi-help.txt*	For Vim version 7.1.  Last change: 2008 Mar 03
-
-			VIM - minimal  help file
-  (NOTE: This is a minimal help file and many tags won't work. Use 'vim' or
-   'gvim' to read the complete help docs.)
-									 k
-      Move around:  Use the cursor keys, or "h" to go left,	       h   l
-		    "j" to go down, "k" to go up, "l" to go right.	 j
-Close this window:  Use ":q<Enter>".
-   Get out of Vim:  Use ":qa!<Enter>" (careful, all changes are lost!).
-
-Jump to a subject:  Position the cursor on a tag between |bars| and hit CTRL-].
-	Jump back:  Type CTRL-T or CTRL-O (repeat to go further back).
-
-Get specific help:  It is possible to go directly to whatever you want help
-		    on, by giving an argument to the ":help" command |:help|.
-		    It is possible to further specify the context:
-							*vi-help-context*
-			  WHAT			PREPEND    EXAMPLE	~
-		      Normal mode command      (nothing)   :help x
-		      Insert mode command	  i_	   :help i_<Esc>
-		      Command-line command	  :	   :help :quit
-		      Command-line editing	  c_	   :help c_<Del>
-		      Vim command argument	  -	   :help -r
-		      Option			  '	   :help 'textwidth'
-  Search for help:  Type ":help word", then hit CTRL-D to see matching
-		    help entries for "word".
-
-VIM stands for Vi IMproved.  Most of VIM was made by Bram Moolenaar, but only
-through the help of many others.  See |vi-credits|.
-------------------------------------------------------------------------------
-3. Credits                              *vi-credits* *vi-author* *vi-Bram* *vi-Moolenaar*
-
-Most of Vim was written by Bram Moolenaar <Bram@vim.org>.
-
-Parts of the documentation come from several Vi manuals, written by:
-        W.N. Joy
-        Alan P.W. Hewett
-        Mark Horton
-
-The Vim editor is based on Stevie and includes (ideas from) other software,
-worked on by the people mentioned here.  Other people helped by sending me
-patches, suggestions and giving feedback about what is good and bad in Vim.
-
-Vim would never have become what it is now, without the help of these people!
-
-        Ron Aaron               Win32 GUI changes
-        Zoltan Arpadffy         work on VMS port
-        Tony Andrews            Stevie
-        Gert van Antwerpen      changes for DJGPP on MS-DOS
-        Berkeley DB(3)          ideas for swap file implementation
-        Keith Bostic            Nvi
-        Walter Briscoe          Makefile updates, various patches
-        Ralf Brown              SPAWNO library for MS-DOS
-        Robert Colon            many useful remarks
-        Marcin Dalecki          GTK+ GUI port, toolbar icons, gettext()
-        Kayhan Demirel          sent me news in Uganda
-        Chris & John Downey     xvi (ideas for multi-windows version)
-        Henk Elbers             first VMS port
-        Daniel Elstner          GTK+ 2 port
-        Eric Fischer            Mac port, 'cindent', and other improvements
-        Benji Fisher            Answering lots of user questions
-        Bill Foster             Athena GUI port
-        Loic Grenie             xvim (ideas for multi windows version)
-        Sven Guckes             Vim promotor and previous WWW page maintainer
-        Darren Hiebert          Exuberant ctags
-        Jason Hildebrand        GTK+ 2 port
-        Bruce Hunsaker          improvements for VMS port
-        Andy Kahn               Cscope support, GTK+ GUI port
-        Oezguer Kesim           Maintainer of Vim Mailing Lists
-        Axel Kielhorn           work on the Macintosh port
-        Steve Kirkendall        Elvis
-        Roger Knobbe            original port to Windows NT
-        Sergey Laskavy          Vim's help from Moscow
-        Felix von Leitner       Maintainer of Vim Mailing Lists
-        David Leonard           Port of Python extensions to Unix
-        Avner Lottem            Edit in right-to-left windows
-        Flemming Madsen         X11 client-server, various features and patches
-        MicroSoft               Gave me a copy of DevStudio to compile Vim with
-        Paul Moore              Python interface extensions, many patches
-        Katsuhito Nagano        Work on multi-byte versions
-        Sung-Hyun Nam           Work on multi-byte versions
-        Vince Negri             Win32 GUI and generic console enhancements
-        Steve Oualline          Author of the first Vim book |frombook|
-        George V. Reilly        Win32 port, Win32 GUI start-off
-        Stephen Riehm           bug collector
-        Stefan Roemer           various patches and help to users
-        Ralf Schandl            IBM OS/390 port
-        Olaf Seibert            DICE and BeBox version, regexp improvements
-        Mortaza Shiran          Farsi patches
-        Peter da Silva          termlib
-        Paul Slootman           OS/2 port
-        Henry Spencer           regular expressions
-        Dany St-Amant           Macintosh port
-        Tim Thompson            Stevie
-        G. R. (Fred) Walter     Stevie
-        Sven Verdoolaege        Perl interface
-        Robert Webb             Command-line completion, GUI versions, and
-                                lots of patches
-        Ingo Wilken             Tcl interface
-        Mike Williams           PostScript printing
-        Juergen Weigert         Lattice version, AUX improvements, UNIX and
-                                MS-DOS ports, autoconf
-        Stefan 'Sec' Zehl       Maintainer of vim.org
-
-I wish to thank all the people that sent me bug reports and suggestions.  The
-list is too long to mention them all here.  Vim would not be the same without
-the ideas from all these people: They keep Vim alive!
-
-
-------------------------------------------------------------------------------
-						*vi-doc-file-list* *V_ct*
-BASIC:
-|copying|	About copyrights
-|iccf|		Helping poor children in Uganda
-|sponsor|	Sponsor Vim development, become a registered Vim user
-|www|		Vim on the World Wide Web
-|bugs|		Where to send bug reports
-
-
-------------------------------------------------------------------------------
-
-Now that you've jumped here with CTRL-] or a double mouse click, you can use
-CTRL-T, CTRL-O, g<RightMouse>, or <C-RightMouse> to go back to where you were.
-------------------------------------------------------------------------------
- vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:
diff --git a/vim-8.0-rhbz1365258.patch b/vim-8.0-rhbz1365258.patch
deleted file mode 100644
index 85498db..0000000
--- a/vim-8.0-rhbz1365258.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up vim80/runtime/syntax/fstab.vim.1365258 vim80/runtime/syntax/fstab.vim
---- vim80/runtime/syntax/fstab.vim.1365258	2016-12-15 10:56:25.822410344 +0100
-+++ vim80/runtime/syntax/fstab.vim	2016-12-15 10:56:52.161519612 +0100
-@@ -36,6 +36,8 @@ syn match fsOperator /[,=:#]/
- syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
- syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
- syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
-+syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDeviceLabel
-+syn keyword fsDeviceKeyword contained PARTUUID nextgroup=fsDeviceUUID
- syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
- syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
- syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs
diff --git a/vim-lua-ftbfs.patch b/vim-lua-ftbfs.patch
deleted file mode 100644
index 22769ff..0000000
--- a/vim-lua-ftbfs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ea3ebd50e2a4ec26ee503f352a1280e11e4af93b Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Tue, 14 Jul 2020 12:14:03 +0200
-Subject: [PATCH] if_lua.c: new Lua 5.4.0 defines luaL_typeerror, so don't
- define it twice
-
----
- src/if_lua.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/if_lua.c b/src/if_lua.c
-index 9852c618e..f25c47b53 100644
---- a/src/if_lua.c
-+++ b/src/if_lua.c
-@@ -120,6 +120,9 @@ static void luaV_call_lua_func_free(void *state);
- #define luaL_loadbufferx dll_luaL_loadbufferx
- #define luaL_argerror dll_luaL_argerror
- #endif
-+#if LUA_VERSION_NUM >= 504
-+#define luaL_typeerror dll_luaL_typeerror
-+#endif
- #define luaL_checkany dll_luaL_checkany
- #define luaL_checklstring dll_luaL_checklstring
- #define luaL_checkinteger dll_luaL_checkinteger
-@@ -217,6 +220,9 @@ int (*dll_luaL_loadfilex) (lua_State *L, const char *filename, const char *mode)
- int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
- int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
- #endif
-+#if LUA_VERSION_NUM >= 504
-+int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname);
-+#endif
- void (*dll_luaL_checkany) (lua_State *L, int narg);
- const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l);
- lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg);
-@@ -335,6 +341,9 @@ static const luaV_Reg luaV_dll[] = {
-     {"luaL_loadfilex", (luaV_function) &dll_luaL_loadfilex},
-     {"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx},
-     {"luaL_argerror", (luaV_function) &dll_luaL_argerror},
-+#endif
-+#if LUA_VERSION_NUM >= 504
-+    {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror},
- #endif
-     {"luaL_checkany", (luaV_function) &dll_luaL_checkany},
-     {"luaL_checklstring", (luaV_function) &dll_luaL_checklstring},
-@@ -457,7 +466,7 @@ lua_enabled(int verbose)
- }
- #endif
- 
--#if LUA_VERSION_NUM > 501
-+#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504
-     static int
- luaL_typeerror(lua_State *L, int narg, const char *tname)
- {
--- 
-2.25.4
-
diff --git a/vim.spec b/vim.spec
index 7e0d7a6..6162feb 100644
--- a/vim.spec
+++ b/vim.spec
@@ -37,8 +37,6 @@ Source13: vim-spell-files.tar.bz2
 %endif
 Source14: spec-template.new
 Source15: macros.vim
-#Source17: ftplugin-spec.vim
-#Source18: syntax-spec.vim
 
 Patch2002: vim-7.0-fixkeys.patch
 Patch2003: vim-7.4-specsyntax.patch
@@ -61,9 +59,8 @@ Patch3016: vim-8.0-copy-paste.patch
 Patch3017: vim-python3-tests.patch
 # fips warning
 Patch3018: vim-crypto-warning.patch
-Patch3019: vim-lua-ftbfs.patch
 # fix dynamic python3 linking with python3.8
-Patch3020: 0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch
+Patch3019: 0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch
 
 # gcc is no longer in buildroot by default
 BuildRequires: gcc
@@ -251,8 +248,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3016 -p1 -b .copypaste
 %patch3017 -p1 -b .python-tests
 %patch3018 -p1
-%patch3019 -p1 -b .lua-ftbfs
-%patch3020 -p1 -b .python38-ftbfs
+%patch3019 -p1 -b .python38-ftbfs
 
 %build
 cd src
@@ -781,6 +777,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %changelog
 * Wed Jul 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1199-1
 - fix python3 dynamic linking with python >= 3.8
+- clean up unused stuff
 
 * Tue Jul 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1199-1
 - FTBFS with Lua - backported patch from upstream pull request to prevent linking with lua
diff --git a/zip.vim b/zip.vim
deleted file mode 100644
index af56944..0000000
--- a/zip.vim
+++ /dev/null
@@ -1,387 +0,0 @@
-" zip.vim: Handles browsing zipfiles
-"            AUTOLOAD PORTION
-" Date:		Jul 30, 2008
-" Version:	22
-" Maintainer:	Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
-" License:	Vim License  (see vim's :help license)
-" Copyright:    Copyright (C) 2005-2008 Charles E. Campbell, Jr. {{{1
-"               Permission is hereby granted to use and distribute this code,
-"               with or without modifications, provided that this copyright
-"               notice is copied with it. Like anything else that's free,
-"               zip.vim and zipPlugin.vim are provided *as is* and comes with
-"               no warranty of any kind, either expressed or implied. By using
-"               this plugin, you agree that in no event will the copyright
-"               holder be liable for any damages resulting from the use
-"               of this software.
-
-" ---------------------------------------------------------------------
-" Load Once: {{{1
-let s:keepcpo= &cpo
-set cpo&vim
-if &cp || exists("g:loaded_zip") || v:version < 700
- finish
-endif
-
-let g:loaded_zip     = "v22"
-let s:zipfile_escape = ' ?&;\'
-let s:ERROR          = 2
-let s:WARNING        = 1
-let s:NOTE           = 0
-
-" ---------------------------------------------------------------------
-"  Global Values: {{{1
-if !exists("g:zip_shq")
- if &shq != ""
-  let g:zip_shq= &shq
- elseif has("unix")
-  let g:zip_shq= "'"
- else
-  let g:zip_shq= '"'
- endif
-endif
-if !exists("g:zip_zipcmd")
- let g:zip_zipcmd= "zip"
-endif
-if !exists("g:zip_unzipcmd")
- let g:zip_unzipcmd= "unzip"
-endif
-
-" ----------------
-"  Functions: {{{1
-" ----------------
-
-" ---------------------------------------------------------------------
-" zip#Browse: {{{2
-fun! zip#Browse(zipfile)
-"  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
-  let repkeep= &report
-  set report=10
-
-  " sanity checks
-  if !exists("*fnameescape")
-   if &verbose > 1
-    echoerr "the zip plugin is not available (your vim doens't support fnameescape())"
-   endif
-   return
-  endif
-  if !executable(g:zip_unzipcmd)
-   redraw!
-   echohl Error | echo "***error*** (zip#Browse) unzip not available on your system"
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("zip#Browse")
-   return
-  endif
-  if !filereadable(a:zipfile)
-   if a:zipfile !~# '^\a\+://'
-    " if its an url, don't complain, let url-handlers such as vim do its thing
-    redraw!
-    echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
-"    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   endif
-   let &report= repkeep
-"   call Dret("zip#Browse : file<".a:zipfile."> not readable")
-   return
-  endif
-"  call Decho("passed sanity checks")
-  if &ma != 1
-   set ma
-  endif
-  let b:zipfile= a:zipfile
-
-  setlocal noswapfile
-  setlocal buftype=nofile
-  setlocal bufhidden=hide
-  setlocal nobuflisted
-  setlocal nowrap
-  set ft=tar
-
-  " give header
-  let lastline= line("$")
-  call setline(lastline+1,'" zip.vim version '.g:loaded_zip)
-  call setline(lastline+2,'" Browsing zipfile '.a:zipfile)
-  call setline(lastline+3,'" Select a file with cursor and press ENTER')
-  $put =''
-  0d
-  $
-
-"  call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1))
-  exe "silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1)
-  if v:shell_error != 0
-   redraw!
-   echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   silent %d
-   let eikeep= &ei
-   set ei=BufReadCmd,FileReadCmd
-   exe "r ".fnameescape(a:zipfile)
-   let &ei= eikeep
-   1d
-"   call Dret("zip#Browse")
-   return
-  endif
-"  call Decho("line 6: ".getline(6))
-  let namecol= stridx(getline(6),'Name') + 1
-"  call Decho("namecol=".namecol)
-  4,$g/^\s*----/d
-  4,$g/^\s*\a/d
-  $d
-  if namecol > 0
-   exe 'silent 4,$s/^.*\%'.namecol.'c//'
-  endif
-
-  setlocal noma nomod ro
-  noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
-
-  let &report= repkeep
-"  call Dret("zip#Browse")
-endfun
-
-" ---------------------------------------------------------------------
-" ZipBrowseSelect: {{{2
-fun! s:ZipBrowseSelect()
-"  call Dfunc("ZipBrowseSelect() zipfile<".b:zipfile."> curfile<".expand("%").">")
-  let repkeep= &report
-  set report=10
-  let fname= getline(".")
-
-  " sanity check
-  if fname =~ '^"'
-   let &report= repkeep
-"   call Dret("ZipBrowseSelect")
-   return
-  endif
-  if fname =~ '/$'
-   redraw!
-   echohl Error | echo "***error*** (zip#Browse) Please specify a file, not a directory" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("ZipBrowseSelect")
-   return
-  endif
-
-"  call Decho("fname<".fname.">")
-
-  " get zipfile to the new-window
-  let zipfile = b:zipfile
-  let curfile= expand("%")
-"  call Decho("zipfile<".zipfile.">")
-"  call Decho("curfile<".curfile.">")
-
-  new
-  if !exists("g:zip_nomax") || g:zip_nomax == 0
-   wincmd _
-  endif
-  let s:zipfile_{winnr()}= curfile
-"  call Decho("exe e ".fnameescape("zipfile:".zipfile.'::'.fname))
-  exe "e ".fnameescape("zipfile:".zipfile.'::'.fname)
-  filetype detect
-
-  let &report= repkeep
-"  call Dret("ZipBrowseSelect : s:zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
-endfun
-
-" ---------------------------------------------------------------------
-" zip#Read: {{{2
-fun! zip#Read(fname,mode)
-"  call Dfunc("zip#Read(fname<".a:fname.">,mode=".a:mode.")")
-  let repkeep= &report
-  set report=10
-
-  if has("unix")
-   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\)::[^\\].*$','\1','')
-   let fname   = substitute(a:fname,'zipfile:.\{-}::\([^\\].*\)$','\1','')
-  else
-   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
-   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
-   let fname = substitute(fname, '[', '[[]', 'g')
-  endif
-"  call Decho("zipfile<".zipfile.">")
-"  call Decho("fname  <".fname.">")
-
-"  call Decho("exe r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1))
-  exe "silent r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1)
-
-  " cleanup
-  0d
-  set nomod
-
-  let &report= repkeep
-"  call Dret("zip#Read")
-endfun
-
-" ---------------------------------------------------------------------
-" zip#Write: {{{2
-fun! zip#Write(fname)
-"  call Dfunc("zip#Write(fname<".a:fname.">) zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
-  let repkeep= &report
-  set report=10
-
-  " sanity checks
-  if !executable(g:zip_zipcmd)
-   redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the zip pgm" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("zip#Write")
-   return
-  endif
-  if !exists("*mkdir")
-   redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, mkdir() doesn't work on your system" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("zip#Write")
-   return
-  endif
-
-  let curdir= getcwd()
-  let tmpdir= tempname()
-"  call Decho("orig tempname<".tmpdir.">")
-  if tmpdir =~ '\.'
-   let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
-  endif
-"  call Decho("tmpdir<".tmpdir.">")
-  call mkdir(tmpdir,"p")
-
-  " attempt to change to the indicated directory
-  if s:ChgDir(tmpdir,s:ERROR,"(zip#Write) cannot cd to temporary directory")
-   let &report= repkeep
-"   call Dret("zip#Write")
-   return
-  endif
-"  call Decho("current directory now: ".getcwd())
-
-  " place temporary files under .../_ZIPVIM_/
-  if isdirectory("_ZIPVIM_")
-   call s:Rmdir("_ZIPVIM_")
-  endif
-  call mkdir("_ZIPVIM_")
-  cd _ZIPVIM_
-"  call Decho("current directory now: ".getcwd())
-
-  if has("unix")
-   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\)::[^\\].*$','\1','')
-   let fname   = substitute(a:fname,'zipfile:.\{-}::\([^\\].*\)$','\1','')
-  else
-   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
-   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
-  endif
-"  call Decho("zipfile<".zipfile.">")
-"  call Decho("fname  <".fname.">")
-
-  if fname =~ '/'
-   let dirpath = substitute(fname,'/[^/]\+$','','e')
-   if executable("cygpath")
-    let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e')
-   endif
-"   call Decho("mkdir(dirpath<".dirpath.">,p)")
-   call mkdir(dirpath,"p")
-  endif
-  if zipfile !~ '/'
-   let zipfile= curdir.'/'.zipfile
-  endif
-"  call Decho("zipfile<".zipfile."> fname<".fname.">")
-
-  exe "w! ".fnameescape(fname)
-  if executable("cygpath")
-   let zipfile = substitute(system("cygpath ".s:Escape(zipfile,0)),'\n','','e')
-  endif
-
-  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
-    let fname = substitute(fname, '[', '[[]', 'g')
-  endif
-
-"  call Decho(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
-  call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
-  if v:shell_error != 0
-   redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-
-  elseif s:zipfile_{winnr()} =~ '^\a\+://'
-   " support writing zipfiles across a network
-   let netzipfile= s:zipfile_{winnr()}
-"   call Decho("handle writing <".zipfile."> across network as <".netzipfile.">")
-   1split|enew
-   let binkeep= &binary
-   let eikeep = &ei
-   set binary ei=all
-   exe "e! ".fnameescape(zipfile)
-   call netrw#NetWrite(netzipfile)
-   let &ei     = eikeep
-   let &binary = binkeep
-   q!
-   unlet s:zipfile_{winnr()}
-  endif
-  
-  " cleanup and restore current directory
-  cd ..
-  call s:Rmdir("_ZIPVIM_")
-  call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!")
-  call s:Rmdir(tmpdir)
-  setlocal nomod
-
-  let &report= repkeep
-"  call Dret("zip#Write")
-endfun
-
-" ---------------------------------------------------------------------
-" s:Escape: {{{2
-fun! s:Escape(fname,isfilt)
-"  call Dfunc("QuoteFileDir(fname<".a:fname."> isfilt=".a:isfilt.")")
-  if exists("*shellescape")
-   if a:isfilt
-    let qnameq= shellescape(a:fname,1)
-   else
-    let qnameq= shellescape(a:fname)
-   endif
-  else
-   let qnameq= g:zip_shq.escape(a:fname,g:zip_shq).g:zip_shq
-  endif
-"  call Dret("QuoteFileDir <".qnameq.">")
-  return qnameq
-endfun
-
-" ---------------------------------------------------------------------
-" ChgDir: {{{2
-fun! s:ChgDir(newdir,errlvl,errmsg)
-"  call Dfunc("ChgDir(newdir<".a:newdir."> errlvl=".a:errlvl."  errmsg<".a:errmsg.">)")
-
-  try
-   exe "cd ".fnameescape(a:newdir)
-  catch /^Vim\%((\a\+)\)\=:E344/
-   redraw!
-   if a:errlvl == s:NOTE
-    echo "***note*** ".a:errmsg
-   elseif a:errlvl == s:WARNING
-    echohl WarningMsg | echo "***warning*** ".a:errmsg | echohl NONE
-   elseif a:errlvl == s:ERROR
-    echohl Error | echo "***error*** ".a:errmsg | echohl NONE
-   endif
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-"   call Dret("ChgDir 1")
-   return 1
-  endtry
-
-"  call Dret("ChgDir 0")
-  return 0
-endfun
-
-" ---------------------------------------------------------------------
-" s:Rmdir: {{{2
-fun! s:Rmdir(fname)
-"  call Dfunc("Rmdir(fname<".a:fname.">)")
-  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
-   call system("rmdir /S/Q ".s:Escape(a:fname,0))
-  else
-   call system("/bin/rm -rf ".s:Escape(a:fname,0))
-  endif
-"  call Dret("Rmdir")
-endfun
-
-" ------------------------------------------------------------------------
-" Modelines And Restoration: {{{1
-let &cpo= s:keepcpo
-unlet s:keepcpo
-" vim:ts=8 fdm=marker