Compare commits

..

55 commits

Author SHA1 Message Date
Zdenek Dohnal
0681b42dbb Merge branch 'f28' into f27 2018-11-27 10:49:21 +01:00
Zdenek Dohnal
74e292c7c8 Merge branch 'f29' into f28 2018-11-27 10:49:12 +01:00
Zdenek Dohnal
7347809c41 Merge branch 'f28' into f27 2018-11-16 13:39:47 +01:00
Zdenek Dohnal
b8d74d9605 Merge branch 'f29' into f28 2018-11-16 13:29:37 +01:00
Zdenek Dohnal
16b5cfa9d3 Merge branch 'f28' into f27 2018-11-08 20:43:36 +01:00
Zdenek Dohnal
1f9fe4a252 Merge branch 'f29' into f28 2018-11-08 20:23:55 +01:00
Zdenek Dohnal
5d3301f2e1 Merge branch 'f28' into f27 2018-11-08 14:51:35 +01:00
Zdenek Dohnal
e0a9af286c Merge branch 'f29' into f28 2018-11-08 14:28:26 +01:00
Zdenek Dohnal
c97fb83882 Merge branch 'f28' into f27 2018-11-05 14:28:22 +01:00
Zdenek Dohnal
ffd22ea492 Merge branch 'f29' into f28 2018-11-05 14:03:47 +01:00
Zdenek Dohnal
d1212e9927 Merge branch 'f28' into f27 2018-10-26 16:40:16 +02:00
Zdenek Dohnal
89e4e3b1b2 Merge branch 'f29' into f28 2018-10-26 16:31:01 +02:00
Zdenek Dohnal
593e520a88 Merge branch 'f28' into f27 2018-10-19 16:21:16 +02:00
Zdenek Dohnal
2fd9abc164 Merge branch 'f29' into f28 2018-10-19 15:51:51 +02:00
Zdenek Dohnal
d0f758e565 Merge branch 'f28' into f27 2018-10-05 16:57:28 +02:00
Zdenek Dohnal
ff61d817fd Merge branch 'f29' into f28 2018-10-05 16:46:58 +02:00
Zdenek Dohnal
c0892a0175 Merge branch 'f28' into f27 2018-10-03 12:46:33 +02:00
Zdenek Dohnal
cc22d31224 Merge branch 'f29' into f28 2018-10-03 12:20:42 +02:00
Zdenek Dohnal
51d4d81266 Merge branch 'f28' into f27 2018-09-19 10:44:34 +02:00
Zdenek Dohnal
f4978f2be7 Merge branch 'f29' into f28 2018-09-19 10:18:54 +02:00
Zdenek Dohnal
a753583917 Merge branch 'f28' into f27 2018-09-07 10:55:23 +02:00
Zdenek Dohnal
5bd6a99d09 Merge branch 'f29' into f28 2018-09-07 10:30:22 +02:00
Zdenek Dohnal
0a802836b4 Merge branch 'f28' into f27 2018-08-27 13:35:16 +02:00
Zdenek Dohnal
a27a03d1ea Merge branch 'f29' into f28 2018-08-27 13:07:42 +02:00
Zdenek Dohnal
fd03a68160 Merge branch 'f28' into f27 2018-08-15 12:01:22 +02:00
Zdenek Dohnal
686726dc66 Merge branch 'f29' into f28 2018-08-15 12:01:16 +02:00
Zdenek Dohnal
23d4bf96d6 Merge branch 'f28' into f27 2018-08-15 09:33:03 +02:00
Zdenek Dohnal
3818da8ae1 Merge branch 'master' into f28 2018-08-15 09:19:26 +02:00
Zdenek Dohnal
d54daa2430 Merge branch 'f28' into f27 2018-08-13 15:31:40 +02:00
Zdenek Dohnal
0bdbe1b8d8 Merge branch 'master' into f28 2018-08-13 14:57:24 +02:00
Zdenek Dohnal
c9b8950ba6 Merge branch 'f28' into f27 2018-08-10 14:21:07 +02:00
Zdenek Dohnal
80125f340e Merge branch 'master' into f28 2018-08-10 14:07:02 +02:00
Zdenek Dohnal
6df1b1d442 Merge branch 'f28' into f27 2018-08-09 08:25:43 +02:00
Zdenek Dohnal
b085431e11 Merge branch 'master' into f28 2018-08-09 08:00:33 +02:00
Zdenek Dohnal
72433fe369 Merge branch 'f28' into f27 2018-08-08 10:27:17 +02:00
Zdenek Dohnal
2f387721ff Merge branch 'master' into f28 2018-08-08 10:17:56 +02:00
Zdenek Dohnal
31ff2819a7 Merge branch 'f28' into f27 2018-08-06 13:32:43 +02:00
Zdenek Dohnal
c53cff967e Merge branch 'master' into f28 2018-08-06 13:06:22 +02:00
Zdenek Dohnal
111fcfaa7c Merge branch 'f28' into f27 2018-08-02 13:35:48 +02:00
Zdenek Dohnal
70309a7dbf Merge branch 'master' into f28 2018-08-02 13:10:10 +02:00
Zdenek Dohnal
ae420511d8 Merge branch 'f28' into f27 2018-07-30 13:11:21 +02:00
Zdenek Dohnal
8a3aa54f0c Merge branch 'master' into f28 2018-07-30 12:08:48 +02:00
Zdenek Dohnal
fb97d4f1d1 Merge branch 'f28' into f27 2018-07-27 13:26:16 +02:00
Zdenek Dohnal
3d947f2508 Merge branch 'master' into f28 2018-07-27 13:26:10 +02:00
Zdenek Dohnal
a698e483ec patchlevel 209 2018-07-25 13:55:38 +02:00
Zdenek Dohnal
1cb0ffb7e2 Merge branch 'master' into f28 2018-07-25 09:06:26 +02:00
Zdenek Dohnal
866d6e78bf - patchlevel 207 2018-07-24 16:16:32 +02:00
Zdenek Dohnal
e54a13df94 Merge branch 'master' into f28 2018-07-23 17:39:48 +02:00
Zdenek Dohnal
dba4d8a5de Merge branch 'master' into f28 2018-07-20 12:31:00 +02:00
Zdenek Dohnal
d35b95c796 Merge branch 'master' into f28 2018-07-19 16:42:14 +02:00
Zdenek Dohnal
196412602e Merge branch 'master' into f28 2018-07-16 08:05:10 +02:00
Zdenek Dohnal
1ce2235946 Merge branch 'master' into f28 2018-07-11 11:49:22 +02:00
Zdenek Dohnal
2ce84daa05 Merge branch 'master' into f28 2018-07-11 10:28:25 +02:00
Zdenek Dohnal
5d2459314f use %{__python3} macro for defining shebang in python3 tests 2018-07-11 08:31:50 +02:00
Jaroslav Škarvada
62d7499305 Backport patch 8.1.0121: crash when using ballooneval related to 'vartabstop'
Commited on behalf of Zdeněk Dohnal <zdohnal@redhat.com>

Resolves: rhbz#1597842

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2018-07-04 14:19:30 +02:00
52 changed files with 3016 additions and 2366 deletions

View file

@ -1 +0,0 @@
1

237
.gitignore vendored
View file

@ -1 +1,236 @@
/vim-*.tar.bz2
/vim-7.4.tar.bz2
/vim-7.4-2342.tar.bz2
/vim-8.0-003.tar.bz2
/vim-8.0-018.tar.bz2
/vim-8.0-037.tar.bz2
/vim-8.0-057.tar.bz2
/vim-8.0-061.tar.bz2
/vim-8.0-000.tar.bz2
/vim-8.0-070.tar.bz2
/vim-8.0-084.tar.bz2
/vim-8.0-085.tar.bz2
/vim-8.0-086.tar.bz2
/vim-8.0-094.tar.bz2
/vim-8.0-095.tar.bz2
/vim-8.0-104.tar.bz2
/vim-8.0-118.tar.bz2
/vim-8.0-124.tar.bz2
/vim-8.0-133.tar.bz2
/vim-8.0-134.tar.bz2
/vim-8.0-142.tar.bz2
/vim-8.0-160.tar.bz2
/vim-8.0-170.tar.bz2
/vim-8.0-172.tar.bz2
/vim-8.0-176.tar.bz2
/vim-8.0-194.tar.bz2
/vim-8.0-197.tar.bz2
/vim-8.0-206.tar.bz2
/vim-8.0-238.tar.bz2
/vim-8.0-271.tar.bz2
/vim-8.0-273.tar.bz2
/vim-8.0-275.tar.bz2
/vim-8.0-297.tar.bz2
/vim-8.0-311.tar.bz2
/vim-8.0-314.tar.bz2
/vim-8.0-318.tar.bz2
/vim-8.0-324.tar.bz2
/vim-8.0-329.tar.bz2
/vim-8.0-342.tar.bz2
/vim-8.0-344.tar.bz2
/vim-8.0-347.tar.bz2
/vim-8.0-363.tar.bz2
/vim-8.0-381.tar.bz2
/vim-8.0-386.tar.bz2
/vim-8.0-388.tar.bz2
/vim-8.0-398.tar.bz2
/vim-8.0-402.tar.bz2
/vim-8.0-425.tar.bz2
/vim-8.0-427.tar.bz2
/vim-8.0-430.tar.bz2
/vim-8.0-442.tar.bz2
/vim-8.0-456.tar.bz2
/vim-8.0-458.tar.bz2
/vim-8.0-494.tar.bz2
/vim-8.0-497.tar.bz2
/vim-8.0-502.tar.bz2
/vim-8.0-503.tar.bz2
/vim-8.0-514.tar.bz2
/vim-8.0-515.tar.bz2
/vim-8.0-517.tar.bz2
/vim-8.0-525.tar.bz2
/vim-8.0-529.tar.bz2
/vim-8.0-540.tar.bz2
/vim-8.0-543.tar.bz2
/vim-8.0-559.tar.bz2
/vim-8.0-562.tar.bz2
/vim-8.0-566.tar.bz2
/vim-8.0-586.tar.bz2
/vim-8.0-596.tar.bz2
/vim-8.0-597.tar.bz2
/vim-8.0-598.tar.bz2
/vim-8.0-599.tar.bz2
/vim-8.0-600.tar.bz2
/vim-8.0-604.tar.bz2
/vim-8.0-606.tar.bz2
/vim-8.0-617.tar.bz2
/vim-8.0-627.tar.bz2
/vim-8.0-628.tar.bz2
/vim-8.0-636.tar.bz2
/vim-8.0-642.tar.bz2
/vim-8.0-647.tar.bz2
/vim-8.0-648.tar.bz2
/vim-8.0-662.tar.bz2
/vim-8.0-679.tar.bz2
/vim-8.0-685.tar.bz2
/vim-8.0-688.tar.bz2
/vim-8.0-691.tar.bz2
/vim-8.0-705.tar.bz2
/vim-8.0-711.tar.bz2
/vim-8.0-728.tar.bz2
/vim-8.0-730.tar.bz2
/vim-8.0-738.tar.bz2
/vim-8.0-739.tar.bz2
/vim-8.0-823.tar.bz2
/vim-8.0-826.tar.bz2
/vim-8.0-844.tar.bz2
/vim-8.0-885.tar.bz2
/vim-8.0-891.tar.bz2
/vim-8.0-893.tar.bz2
/vim-8.0-895.tar.bz2
/vim-8.0-896.tar.bz2
/vim-8.0-938.tar.bz2
/vim-8.0-946.tar.bz2
/vim-8.0-956.tar.bz2
/vim-8.0-983.tar.bz2
/vim-8.0-987.tar.bz2
/vim-8.0-992.tar.bz2
/vim-8.0-1030.tar.bz2
/vim-8.0-1052.tar.bz2
/vim-8.0-1056.tar.bz2
/vim-8.0-1064.tar.bz2
/vim-8.0-1067.tar.bz2
/vim-8.0-1071.tar.bz2
/vim-8.0-1092.tar.bz2
/vim-8.0-1097.tar.bz2
/vim-8.0-1098.tar.bz2
/vim-8.0-1102.tar.bz2
/vim-8.0-1123.tar.bz2
/vim-8.0-1127.tar.bz2
/vim-8.0-1129.tar.bz2
/vim-8.0-1132.tar.bz2
/vim-8.0-1144.tar.bz2
/vim-8.0-1155.tar.bz2
/vim-8.0-1171.tar.bz2
/vim-8.0-1173.tar.bz2
/vim-8.0-1175.tar.bz2
/vim-8.0-1176.tar.bz2
/vim-8.0-1184.tar.bz2
/vim-8.0-1187.tar.bz2
/vim-8.0-1203.tar.bz2
/vim-8.0-1207.tar.bz2
/vim-8.0-1213.tar.bz2
/vim-8.0-1216.tar.bz2
/vim-8.0-1226.tar.bz2
/vim-8.0-1238.tar.bz2
/vim-8.0-1240.tar.bz2
/vim-8.0-1241.tar.bz2
/vim-8.0-1257.tar.bz2
/vim-8.0-1272.tar.bz2
/vim-8.0-1274.tar.bz2
/vim-8.0-1283.tar.bz2
/vim-8.0-1322.tar.bz2
/vim-8.0-1326.tar.bz2
/vim-8.0-1330.tar.bz2
/vim-8.0-1349.tar.bz2
/vim-8.0-1351.tar.bz2
/vim-8.0-1358.tar.bz2
/vim-8.0-1359.tar.bz2
/vim-8.0-1360.tar.bz2
/vim-8.0-1367.tar.bz2
/vim-8.0-1376.tar.bz2
/vim-8.0-1379.tar.bz2
/vim-8.0-1386.tar.bz2
/vim-8.0-1387.tar.bz2
/vim-8.0-1389.tar.bz2
/vim-8.0-1390.tar.bz2
/vim-8.0-1401.tar.bz2
/vim-8.0-1406.tar.bz2
/vim-8.0-1427.tar.bz2
/vim-8.0-1428.tar.bz2
/vim-8.0-1438.tar.bz2
/vim-8.0-1451.tar.bz2
/vim-8.0-1473.tar.bz2
/vim-8.0-1475.tar.bz2
/vim-8.0-1478.tar.bz2
/vim-8.0-1505.tar.bz2
/vim-8.0-1509.tar.bz2
/vim-8.0-1520.tar.bz2
/vim-8.0-1523.tar.bz2
/vim-8.0-1527.tar.bz2
/vim-8.0-1543.tar.bz2
/vim-8.0-1553.tar.bz2
/vim-8.0-1569.tar.bz2
/vim-8.0-1573.tar.bz2
/vim-8.0-1587.tar.bz2
/vim-8.0-1589.tar.bz2
/vim-8.0-1591.tar.bz2
/vim-8.0-1599.tar.bz2
/vim-8.0-1603.tar.bz2
/vim-8.0-1605.tar.bz2
/vim-8.0-1625.tar.bz2
/vim-8.0-1630.tar.bz2
/vim-8.0-1661.tar.bz2
/vim-8.0-1666.tar.bz2
/vim-8.0-1679.tar.bz2
/vim-8.0-1704.tar.bz2
/vim-8.0-1755.tar.bz2
/vim-8.0-1763.tar.bz2
/vim-8.0-1765.tar.bz2
/vim-8.0-1766.tar.bz2
/vim-8.0-1787.tar.bz2
/vim-8.0-1788.tar.bz2
/vim-8.0-1789.tar.bz2
/vim-8.0-1806.tar.bz2
/vim-8.0-1813.tar.bz2
/vim-8.0-1842.tar.bz2
/vim-8.0-1848.tar.bz2
/vim-8.1-001.tar.bz2
/vim-8.1-010.tar.bz2
/vim-8.1-016.tar.bz2
/vim-8.1-020.tar.bz2
/vim-8.1-022.tar.bz2
/vim-8.1-026.tar.bz2
/vim-8.1-034.tar.bz2
/vim-8.1-035.tar.bz2
/vim-8.1-039.tar.bz2
/vim-8.1-042.tar.bz2
/vim-8.1-055.tar.bz2
/vim-8.1-072.tar.bz2
/vim-8.1-095.tar.bz2
/vim-8.1-115.tar.bz2
/vim-8.1-117.tar.bz2
/vim-8.1-119.tar.bz2
/vim-8.1-177.tar.bz2
/vim-8.1-189.tar.bz2
/vim-8.1-197.tar.bz2
/vim-8.1-207.tar.bz2
/vim-8.1-209.tar.bz2
/vim-8.1-213.tar.bz2
/vim-8.1-229.tar.bz2
/vim-8.1-233.tar.bz2
/vim-8.1-240.tar.bz2
/vim-8.1-254.tar.bz2
/vim-8.1-258.tar.bz2
/vim-8.1-264.tar.bz2
/vim-8.1-279.tar.bz2
/vim-8.1-287.tar.bz2
/vim-8.1-328.tar.bz2
/vim-8.1-351.tar.bz2
/vim-8.1-408.tar.bz2
/vim-8.1-450.tar.bz2
/vim-8.1-451.tar.bz2
/vim-8.1-483.tar.bz2
/vim-8.1-497.tar.bz2
/vim-8.1-511.tar.bz2
/vim-8.1-513.tar.bz2
/vim-8.1-527.tar.bz2

140
7.4.899 Normal file
View file

@ -0,0 +1,140 @@
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 ///

430
Changelog.rpm Normal file
View file

@ -0,0 +1,430 @@
* 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

1
ci.fmf
View file

@ -1 +0,0 @@
resultsdb-testcase: separate

210
ftplugin-spec.vim Normal file
View file

@ -0,0 +1,210 @@
" 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"

View file

@ -1,25 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

64
gvim.desktop Normal file
View file

@ -0,0 +1,64 @@
[Desktop Entry]
Name=Vi IMproved
Name[bg]=Vi Ðåäàêòîð
Name[ca]=Vi Millorat
Name[da]=Vi forbedret
Name[eo]=VIM
Name[et]=Täiustatud Vi (vim)
Name[fr]=Vi étendu (VIM)
Name[he]=רפושמ Vi
Name[hu]=Vi
Name[is]=Vi IMproved ritillinn
Name[it]=Vi iMproved
Name[no]=Vi IMproved (forbedret VI)
Name[pl]=Poprawiony VI (vim)
Name[ro]=VIM
Name[ru]=Улучшенный VI
Name[sk]=Vi IMpreved
Name[sl]=Izboljšani vi (vim)
Name[sv]=Förbättrad Vi
Name[zh_CN.GB2312]= Vi
Comment=Powerful text editor with scripting functions and macro recorder
Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
Comment[ca]=Editor vi potent
Comment[cs]=Mocný textový editor vi
Comment[da]=En kraftig vi tekstbehandler
Comment[de]=Ein leistungsfähiger vi-Editor
Comment[el]=Πανίσχυρος διορθωτής vi
Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
Comment[es]=Una versión mejorada del editor vi
Comment[et]=Võimas tekstiredaktor vi
Comment[fi]=Tehokas vi-tekstieditori
Comment[fr]=Éditeur vi puissant
Comment[gl]=Potente editor vi
Comment[he]=Vi המצועה בר ךרועה
Comment[hr]=Napredni vi uređivač
Comment[hu]=Vi szövegszerkesztő
Comment[is]=Öflug útgáfa vi ritilsins
Comment[it]=Un editor vi potenziato
Comment[ja]=Vi
Comment[lt]=Galingas vi redaktorius
Comment[mk]=Моќен VI уредувач
Comment[nl]=Krachtige vi-editor
Comment[no]=En kraftig vi-redigerer
Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
Comment[pl]=Edytor vi
Comment[pt]=Um poderoso editor de texto
Comment[ro]=Un editor de texte VI, puternic
Comment[ru]=Мощный текстовый редактор vi
Comment[sk]=Silný textový procesor vi
Comment[sl]=Zmogljivi urejevalnik vi
Comment[sr]=Moćni vi editor
Comment[sv]=En kraftfull texteditor
Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
Comment[tr]=Güçlü vi düzenleyicisi
Comment[uk]=Потужний редактор vi
Comment[zh_CN.GB2312]= vi
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=gvim -f %F
Icon=gvim
Type=Application
Terminal=false
X-XClassHintResName=VIM
MapNotify=false
Categories=Utility;TextEditor;

View file

@ -1,35 +0,0 @@
/tier1-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/vim.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/vim.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/vim.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/vim.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/vim.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/vim.git
name: /plans/others/public

View file

@ -1 +1 @@
SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3
SHA512 (vim-8.1-527.tar.bz2) = 2fa5889dba3267d6c0b547df5adde836a58f2b2a09f60573c0d06ef480b5381d304fa04fd6a535087595e93ae244223c96dc3974036a7eaa3c039a52967c6960

42
spec-template Normal file
View file

@ -0,0 +1,42 @@
Name:
Version:
Release: 1%{?dist}
Summary:
Group:
License:
URL:
Source0:
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:
Requires:
%description
%prep
%setup -q
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc
%changelog

View file

@ -1,20 +1,15 @@
# SPEC file overview:
# https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages/#con_rpm-spec-file-overview
# Fedora packaging guidelines:
# https://docs.fedoraproject.org/en-US/packaging-guidelines/
Name:
Version:
Release: 1%{?dist}
Summary:
Group:
License:
URL:
Source0:
Name:
Version:
Release: 0%{?dist}
Summary:
License:
URL:
Source0:
BuildRequires:
Requires:
BuildRequires:
Requires:
%description
@ -34,7 +29,6 @@ make %{?_smp_mflags}
%files
%doc
%license

236
syntax-spec.vim Normal file
View file

@ -0,0 +1,236 @@
" 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

View file

@ -0,0 +1,63 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of netrw-plugin-delete-command-broken
# Description: Test for netrw plugin: delete command broken
# Author: Petr Splichal <psplicha@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2009 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/CoreOS/vim/Regression/netrw-plugin-delete-command-broken
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Petr Splichal <psplicha@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: Test for netrw plugin: delete command broken" >> $(METADATA)
@echo "Type: Regression" >> $(METADATA)
@echo "TestTime: 5m" >> $(METADATA)
@echo "RunFor: vim" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Requires: vim-enhanced" >> $(METADATA)
rhts-lint $(METADATA)

View file

@ -0,0 +1,9 @@
PURPOSE of netrw-plugin-delete-command-broken
Description: Test for netrw plugin: delete command broken
Author: Petr Splichal <psplicha@redhat.com>
Summary: netrw plugin: delete command broken
Description:
Regression to to verify the delete command of netrw plugin
successfully deletes files or directories.

View file

@ -0,0 +1,64 @@
#!/bin/bash
# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/vim/Regression/netrw-plugin-delete-command-broken
# Description: Test for netrw plugin: delete command broken
# Author: Petr Splichal <psplicha@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2009 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include rhts environment
. /usr/bin/rhts-environment.sh
. /usr/share/rhts-library/rhtslib.sh
PACKAGE="vim-enhanced"
rlJournalStart
rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
rlRun "pushd $TmpDir"
# create test file & dir
rlRun "touch testfile" 0 "Creating test file"
rlRun "mkdir testdir" 0 "Creating test directory"
rlAssertExists "testfile"
rlAssertExists "testdir"
# create vim scripts
rlRun "echo '/testfile Dy :q' > scriptfile" \
0 "Creating file delete script"
rlRun "echo '/testdir Dy :q' > scriptdir" \
0 "Creating directory delete script"
rlPhaseEnd
rlPhaseStartTest
rlRun "vim . -s scriptfile" 0 "Deleting file using netrw"
rlAssertNotExists "testfile"
rlRun "vim . -s scriptdir" 0 "Deleting directory using netrw"
rlAssertNotExists "testdir"
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

23
tests/tests.yml Normal file
View file

@ -0,0 +1,23 @@
---
# This first play always runs on the local staging system
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
- container
tests:
- netrw-plugin-delete-command-broken
- vim-in-ex-mode-incorrectly-gives-an-eol-error
required_packages:
- vim-minimal
- vim-enhanced
# Tests for Atomic Host
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- atomic
tests:
- vim-in-ex-mode-incorrectly-gives-an-eol-error

View file

@ -0,0 +1,63 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
# Description: Test for vim in ex mode incorrectly gives an eol error
# Author: David Kutalek <dkutalek@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE exdoublequote expounddoublequote
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: David Kutalek <dkutalek@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: Test for vim in ex mode incorrectly gives an eol error" >> $(METADATA)
@echo "Type: Regression" >> $(METADATA)
@echo "TestTime: 5m" >> $(METADATA)
@echo "RunFor: vim" >> $(METADATA)
@echo "Requires: vim-minimal" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
rhts-lint $(METADATA)

View file

@ -0,0 +1,3 @@
PURPOSE of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
Description: Test for vim in ex mode incorrectly gives an eol error
Author: David Kutalek <dkutalek@redhat.com>

View file

@ -0,0 +1,2 @@
" comment
q

View file

@ -0,0 +1,2 @@
#" comment
q

View file

@ -0,0 +1,46 @@
#!/bin/bash
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
# Description: Test for vim in ex mode incorrectly gives an eol error
# Author: David Kutalek <dkutalek@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include rhts environment
. /usr/bin/rhts-environment.sh
. /usr/lib/beakerlib/beakerlib.sh
PACKAGE="vim"
rlJournalStart
rlPhaseStartSetup
rlAssertRpm vim-minimal
rlPhaseEnd
rlPhaseStartTest
rlRun "ex -u NONE ~/.bash_profile < ./exdoublequote"
rlRun "ex -u NONE ~/.bash_profile < ./expounddoublequote"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

126
vi_help.txt Normal file
View file

@ -0,0 +1,126 @@
*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:

View file

@ -1,23 +0,0 @@
#!/usr/bin/sh
# run vim if:
# - 'vi' command is used and 'vim' binary is available
# - 'vim' command is used
# NOTE: Set up a local alias if you want vim -> vi functionality. We will not
# do it globally, because it messes up with available startup options (see
# ':help starting', 'vi' is not capable of '-d'). The introducing an environment
# variable, which an user must set to get the feature, will do the same trick
# as setting an alias (needs user input, does not work with sudo), so it is left
# on user whether he decides to use an alias:
#
# alias vim=vi
#
# in bashrc file.
if test -f /usr/bin/vim
then
exec /usr/bin/vim "$@"
fi
# run vi otherwise
exec /usr/libexec/vi "$@"

View file

@ -1,10 +0,0 @@
#!/usr/bin/sh
# run vim -R if available
if test -f /usr/bin/vim
then
exec /usr/bin/vim -R "$@"
fi
# run vi otherwise
exec /usr/libexec/vi -R "$@"

View file

@ -1,26 +1,25 @@
diff -up vim90/src/term.c.fixkeys vim90/src/term.c
--- vim90/src/term.c.fixkeys 2022-10-20 14:45:53.896659582 +0200
+++ vim90/src/term.c 2022-10-20 14:48:28.958697659 +0200
@@ -851,14 +851,14 @@ static struct builtin_term builtin_termc
{K_XRIGHT, "\033[@;*C"}, // Esc [ C or Esc [ 1 ; C
{K_XLEFT, "\033[@;*D"}, // Esc [ D or Esc [ 1 ; D
// An extra set of function keys for vt100 mode
- {K_XF1, "\033O*P"},
- {K_XF2, "\033O*Q"},
- {K_XF3, "\033O*R"},
- {K_XF4, "\033O*S"},
- {K_F1, "\033[11;*~"},
- {K_F2, "\033[12;*~"},
- {K_F3, "\033[13;*~"},
- {K_F4, "\033[14;*~"},
+ {K_XF1, "\033[11~"},
+ {K_XF2, "\033[12~"},
+ {K_XF3, "\033[13~"},
+ {K_XF4, "\033[14~"},
+ {K_F1, "\033OP"},
+ {K_F2, "\033OQ"},
+ {K_F3, "\033OR"},
+ {K_F4, "\033OS"},
{K_F5, "\033[15;*~"},
{K_F6, "\033[17;*~"},
{K_F7, "\033[18;*~"},
--- vim70aa/src/term.c.orig 2006-03-01 23:07:55.000000000 +0100
+++ vim70aa/src/term.c 2006-03-14 15:39:12.000000000 +0100
@@ -1008,14 +1008,14 @@
{K_XRIGHT, IF_EB("\033[1;*C", ESC_STR "[1;*C")},
{K_XLEFT, IF_EB("\033[1;*D", ESC_STR "[1;*D")},
/* An extra set of function keys for vt100 mode */
- {K_XF1, IF_EB("\033O*P", ESC_STR "O*P")},
- {K_XF2, IF_EB("\033O*Q", ESC_STR "O*Q")},
- {K_XF3, IF_EB("\033O*R", ESC_STR "O*R")},
- {K_XF4, IF_EB("\033O*S", ESC_STR "O*S")},
- {K_F1, IF_EB("\033[11;*~", ESC_STR "[11;*~")},
- {K_F2, IF_EB("\033[12;*~", ESC_STR "[12;*~")},
- {K_F3, IF_EB("\033[13;*~", ESC_STR "[13;*~")},
- {K_F4, IF_EB("\033[14;*~", ESC_STR "[14;*~")},
+ {K_XF1, IF_EB("\033[11~", ESC_STR "[11~")},
+ {K_XF2, IF_EB("\033[12~", ESC_STR "[12~")},
+ {K_XF3, IF_EB("\033[13~", ESC_STR "[13~")},
+ {K_XF4, IF_EB("\033[14~", ESC_STR "[14~")},
+ {K_F1, IF_EB("\033OP", ESC_STR "OP")},
+ {K_F2, IF_EB("\033OQ", ESC_STR "OQ")},
+ {K_F3, IF_EB("\033OR", ESC_STR "OR")},
+ {K_F4, IF_EB("\033OS", ESC_STR "OS")},
{K_F5, IF_EB("\033[15;*~", ESC_STR "[15;*~")},
{K_F6, IF_EB("\033[17;*~", ESC_STR "[17;*~")},
{K_F7, IF_EB("\033[18;*~", ESC_STR "[18;*~")},

15
vim-7.0-rclocation.patch Normal file
View file

@ -0,0 +1,15 @@
--- vim62/src/os_unix.h.rcloc 2003-08-04 15:38:05.000000000 +0200
+++ vim62/src/os_unix.h 2003-08-04 15:39:25.000000000 +0200
@@ -230,10 +230,10 @@
* Unix system-dependent file names
*/
#ifndef SYS_VIMRC_FILE
-# define SYS_VIMRC_FILE "$VIM/vimrc"
+# define SYS_VIMRC_FILE "/etc/vimrc"
#endif
#ifndef SYS_GVIMRC_FILE
-# define SYS_GVIMRC_FILE "$VIM/gvimrc"
+# define SYS_GVIMRC_FILE "/etc/gvimrc"
#endif
#ifndef DFLT_HELPFILE
# define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt"

64
vim-7.0-specedit.patch Normal file
View file

@ -0,0 +1,64 @@
--- vim70/runtime/ftplugin/spec.vim.rh1 2006-05-10 19:37:45.000000000 +0200
+++ vim70/runtime/ftplugin/spec.vim 2006-11-13 12:21:32.000000000 +0100
@@ -18,11 +18,18 @@
if !exists("*s:SpecChangelog")
function s:SpecChangelog(format)
+ let save_time = v:lc_time
if strlen(a:format) == 0
if !exists("g:spec_chglog_format")
- let email = input("Email address: ")
- let g:spec_chglog_format = "%a %b %d %Y " . l:email
- echo "\r"
+ if !exists("g:packager")
+ let email = input("Email address: ")
+ let g:spec_chglog_format = "%a %b %d %Y " . l:email
+ echo "\r"
+ else
+ let email = g:packager
+ let g:spec_chglog_format = "%a %b %d %Y " . l:email
+ echo "\r"
+ endif
endif
let format = g:spec_chglog_format
else
@@ -58,7 +65,7 @@
let line = line+1
endwhile
if (nameline != -1 && verline != -1 && relline != -1)
- let include_release_info = exists("g:spec_chglog_release_info")
+ let include_release_info = 1
let name = s:ParseRpmVars(name, nameline)
let ver = s:ParseRpmVars(ver, verline)
let rel = s:ParseRpmVars(rel, relline)
@@ -79,8 +86,10 @@
endif
endif
if (chgline != -1)
+ execute "language time C"
let parsed_format = "* ".strftime(format)
- let release_info = "+ ".name."-".ver."-".rel
+ execute "language time " . save_time
+ let release_info = ver."-".rel
let wrong_format = 0
let wrong_release = 0
let insert_line = 0
@@ -97,15 +106,14 @@
execute relline
normal 
let rel = substitute(strpart(getline(relline),8), '^[ ]*\([^ ]\+\)[ ]*$','\1','')
- let release_info = "+ ".name."-".ver."-".rel
+ let release_info = 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)
+ let parsed_format = parsed_format." ".release_info
endif
+ call append(chgline+n, parsed_format)
let n = n + 1
call append(chgline+n,"- ")
let n = n + 1

12
vim-7.4-checkhl.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up vim74/runtime/syntax/spec.vim.kh1 vim74/runtime/syntax/spec.vim
--- vim74/runtime/syntax/spec.vim.kh1 2016-08-04 15:23:25.275955301 +0200
+++ vim74/runtime/syntax/spec.vim 2016-08-04 15:24:56.699417602 +0200
@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
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
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|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

21
vim-7.4-fstabsyntax.patch Normal file
View file

@ -0,0 +1,21 @@
diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.vim
--- vim80/runtime/syntax/fstab.vim.fstabsyntax 2017-11-19 20:32:49.000000000 +0100
+++ vim80/runtime/syntax/fstab.vim 2017-11-20 16:01:31.494316342 +0100
@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe
" Type
syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
syn match fsTypeUnknown /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
" Options
" -------
@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
syn keyword fsOptionsYesNo yes no
syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
syn match fsOptionsGeneral /_netdev/
" Options: adfs

View file

@ -1,12 +1,12 @@
diff -up vim91/runtime/syntax/spec.vim.globalsyntax vim91/runtime/syntax/spec.vim
--- vim91/runtime/syntax/spec.vim.globalsyntax 2024-09-20 22:29:01.858870640 +0200
+++ vim91/runtime/syntax/spec.vim 2024-09-20 22:31:43.776217933 +0200
@@ -112,7 +112,7 @@ syn region specDescriptionArea matchgrou
diff -up vim74/runtime/syntax/spec.vim.orig vim74/runtime/syntax/spec.vim
--- vim74/runtime/syntax/spec.vim.orig 2016-01-12 13:51:55.727569873 +0100
+++ vim74/runtime/syntax/spec.vim 2016-01-12 13:53:08.124991178 +0100
@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
"%% Scripts Section %%
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' 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
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|global\|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
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|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
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|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

View file

@ -0,0 +1,15 @@
diff -up vim74_new/runtime/syntax/spec.vim.1151450 vim74_new/runtime/syntax/spec.vim
--- vim74_new/runtime/syntax/spec.vim.1151450 2014-10-13 10:45:07.570944538 +0200
+++ vim74_new/runtime/syntax/spec.vim 2014-10-13 10:44:09.046945965 +0200
@@ -88,9 +88,9 @@ syn region specSectionMacroBracketArea o
"%% 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
+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' 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\)\>'
+syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>'
"valid options for certain section headers
syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1

11
vim-7.4-nowarnings.patch Normal file
View file

@ -0,0 +1,11 @@
diff -up vim74/src/ex_docmd.c.e319 vim74/src/ex_docmd.c
--- vim74/src/ex_docmd.c.e319 2016-02-17 14:48:23.033995923 +0100
+++ vim74/src/ex_docmd.c 2016-02-17 14:48:03.712890575 +0100
@@ -4630,6 +4630,7 @@ get_flags(exarg_T *eap)
void
ex_ni(exarg_T *eap)
{
+ return;
if (!eap->skip)
eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
}

View file

@ -0,0 +1,14 @@
diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim
--- vim74/runtime/ftplugin/spec.vim.1318991 2016-08-04 15:29:42.423862424 +0200
+++ vim74/runtime/ftplugin/spec.vim 2016-08-04 15:31:08.797299188 +0200
@@ -41,8 +41,8 @@ else:
headers = spec.sourceHeader
version = headers["Version"]
release = headers["Release"]
- vim.command("let ver = " + version)
- vim.command("let rel = " + release)
+ vim.command("let ver = '" + version + "'")
+ vim.command("let rel = '" + release + "'")
PYEND
endif
endfunction

View file

@ -1,6 +1,6 @@
diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
--- vim91/runtime/syntax/spec.vim.spec-syntax 2025-11-14 07:38:27.000000000 +0100
+++ vim91/runtime/syntax/spec.vim 2025-11-14 07:52:56.081212607 +0100
diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
--- vim74/runtime/syntax/spec.vim.highlite 2016-07-04 10:17:45.000000000 +0200
+++ vim74/runtime/syntax/spec.vim 2016-08-04 15:20:26.116049343 +0200
@@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
syn match specManpageFile '[a-zA-Z]\.1'
@ -10,12 +10,24 @@ diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
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
@@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe
"specComands
syn match specConfigure contained '\./configure'
-syn match specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
+syn match specTarCommand contained '\<tar\s\+[cxvpzIjf]\{,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 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 bzip2 bunzip2 gunzip
syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
"frequently used rpm env vars
@@ -105,7 +105,7 @@ 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\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' 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\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' 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
+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\|ExcludeOS\|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

25
vim-7.4-syncolor.patch Normal file
View file

@ -0,0 +1,25 @@
diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c
--- vim80/src/syntax.c.syncolor 2017-08-15 12:14:21.716020676 +0200
+++ vim80/src/syntax.c 2017-08-15 12:30:31.380158974 +0200
@@ -6972,8 +6972,8 @@ static char *(highlight_init_light[]) =
CENT("Visual term=reverse",
"Visual term=reverse guibg=LightGrey"),
#ifdef FEAT_DIFF
- CENT("DiffAdd term=bold ctermbg=LightBlue",
- "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
+ CENT("DiffAdd term=bold ctermbg=LightRed",
+ "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"),
CENT("DiffChange term=bold ctermbg=LightMagenta",
"DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
@@ -7066,8 +7066,8 @@ static char *(highlight_init_dark[]) = {
CENT("Visual term=reverse",
"Visual term=reverse guibg=DarkGrey"),
#ifdef FEAT_DIFF
- CENT("DiffAdd term=bold ctermbg=DarkBlue",
- "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
+ CENT("DiffAdd term=bold ctermbg=DarkRed",
+ "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"),
CENT("DiffChange term=bold ctermbg=DarkMagenta",
"DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",

11
vim-7.4-syntax.patch Normal file
View file

@ -0,0 +1,11 @@
--- vim74/runtime/filetype.vim.orig 2013-08-12 14:51:58.669350813 +0200
+++ vim74/runtime/filetype.vim 2013-08-12 14:56:12.432540523 +0200
@@ -2475,7 +2475,7 @@
" More Apache config files
au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf* call s:StarSetf('apache')
-au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
" Asterisk config file
au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')

View file

@ -1,95 +1,16 @@
diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim
--- vim91/runtime/defaults.vim.copypaste 2025-06-27 06:43:53.000000000 +0200
+++ vim91/runtime/defaults.vim 2025-07-11 09:16:19.013363739 +0200
@@ -70,18 +70,6 @@ sunmap Q
diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim
--- vim80/runtime/defaults.vim.copy-paste 2016-12-19 09:01:20.351119199 +0100
+++ vim80/runtime/defaults.vim 2016-12-19 09:01:53.735738941 +0100
@@ -64,12 +64,6 @@ map Q gq
" Revert with ":iunmap <C-U>".
inoremap <C-U> <C-G>u<C-U>
-" In many terminal emulators the mouse works just fine. By enabling it you
-" can position the cursor, Visually select and scroll with the mouse.
-" Only xterm can grab the mouse events when using the shift key, for other
-" terminals use ":", select text and press Esc.
-if has('mouse')
- if &term =~ 'xterm'
- set mouse=a
- else
- set mouse=nvi
- endif
- set mouse=a
-endif
-
" Only do this part when Vim was compiled with the +eval feature.
if 1
diff -up vim91/src/testdir/test_balloon.vim.copypaste vim91/src/testdir/test_balloon.vim
--- vim91/src/testdir/test_balloon.vim.copypaste 2025-07-11 09:16:19.013500976 +0200
+++ vim91/src/testdir/test_balloon.vim 2025-07-11 09:17:20.168187029 +0200
@@ -7,6 +7,7 @@ CheckFeature balloon_eval_term
source util/screendump.vim
let s:common_script =<< trim [CODE]
+ set mouse=a
call setline(1, ["one one one", "two tXo two", "three three three"])
set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100
let s:trailing = '<' " check that script context is set
diff -up vim91/src/testdir/test_popup.vim.copypaste vim91/src/testdir/test_popup.vim
--- vim91/src/testdir/test_popup.vim.copypaste 2025-07-11 08:58:40.000000000 +0200
+++ vim91/src/testdir/test_popup.vim 2025-07-11 09:16:19.013692144 +0200
@@ -957,6 +957,7 @@ func Test_mouse_popup_position()
let script =<< trim END
set mousemodel=popup_setpos
source $VIMRUNTIME/menu.vim
+ set mouse=a
call setline(1, join(range(20)))
func Trigger(col)
call test_setmouse(1, a:col)
diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_popupwin.vim
--- vim91/src/testdir/test_popupwin.vim.copypaste 2025-07-11 08:58:40.000000000 +0200
+++ vim91/src/testdir/test_popupwin.vim 2025-07-11 09:16:19.013971633 +0200
@@ -556,6 +556,7 @@ func Test_popup_drag()
" create a popup that covers the command line
let lines =<< trim END
call setline(1, range(1, 20))
+ set mouse=a
split
vsplit
$wincmd w
@@ -623,6 +624,7 @@ func Test_popup_drag_minwidth()
" create a popup that does not fit
let lines =<< trim END
+ set mouse=a
call range(40)
\ ->map({_,i -> string(i)})
\ ->popup_create({
@@ -670,6 +672,7 @@ func Test_popup_drag_termwin()
let lines =<< trim END
set foldmethod=marker
call setline(1, range(100))
+ set mouse=a
for nr in range(7)
call setline(nr * 12 + 1, "fold {{{")
call setline(nr * 12 + 11, "end }}}")
@@ -722,6 +725,7 @@ func Test_popup_close_with_mouse()
let lines =<< trim END
call setline(1, range(1, 20))
+ set mouse=a
" With border, can click on X
let winid = popup_create('foobar', #{
\ close: 'button',
@@ -1559,6 +1563,7 @@ func Test_popup_beval()
let lines =<< trim END
call setline(1, range(1, 20))
call setline(5, 'here is some text to hover over')
+ set mouse=a
set balloonevalterm
set balloonexpr=BalloonExpr()
set balloondelay=100
@@ -2269,6 +2274,7 @@ func Test_popup_scrollbar()
let lines =<< trim END
call setline(1, range(1, 20))
+ set mouse=a
hi ScrollThumb ctermbg=blue
hi ScrollBar ctermbg=red
let winid = popup_create(['one', 'two', 'three', 'four', 'five',
" 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")

12
vim-8.0-rhbz1365258.patch Normal file
View file

@ -0,0 +1,12 @@
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

View file

@ -1,85 +0,0 @@
diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in
--- vim91/src/config.h.in.fips-warning 2025-10-31 08:12:59.598267544 +0100
+++ vim91/src/config.h.in 2025-10-31 08:14:45.661859595 +0100
@@ -526,5 +526,14 @@
/* Define if _SC_SIGSTKSZ is available via sysconf() */
#undef HAVE_SYSCONF_SIGSTKSZ
+/* Do we need FIPS warning? */
+#undef HAVE_FIPS_WARNING
+
+/* Link to system-fips file */
+#undef SYSTEM_FIPS_FILE_LINK
+
+/* Link to fips_enabled file */
+#undef FIPS_ENABLED_FILE_LINK
+
/* Define if you want to load libgpm dynamically */
#undef DYNAMIC_GPM
diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac
--- vim91/src/configure.ac.fips-warning 2025-10-31 08:12:59.596711911 +0100
+++ vim91/src/configure.ac 2025-10-31 08:12:59.598566242 +0100
@@ -631,6 +631,38 @@ else
AC_SUBST(XDIFF_OBJS_USED)
fi
+dnl Checking if we want FIPS warning
+
+AC_MSG_CHECKING(--enable-fips-warning)
+AC_ARG_ENABLE([fips-warning],
+ AS_HELP_STRING([--enable-fips-warning], [Enable FIPS warning]),
+ ,[enable_fips_warning="no"])
+
+if test "$enable_fips_warning" = "yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_FIPS_WARNING])
+
+ dnl Setting path for system-fips file
+
+ AC_MSG_CHECKING(--with-system-fips-file argument)
+ AC_ARG_WITH([system-fips-file], [ --with-system-fips-file=PATH Link to system-fips file (default: /etc/system-fips)],
+ with_system_fips_file=$withval,
+ with_system_fips_file="/etc/system-fips")
+ AC_MSG_RESULT([$with_system_fips_file])
+ AC_DEFINE_UNQUOTED([SYSTEM_FIPS_FILE_LINK], ["$with_system_fips_file"])
+
+ dnl Setting link to fips_enabled file
+
+ AC_MSG_CHECKING(--with-fips-enabled-file argument)
+ AC_ARG_WITH([fips-enabled-file], [ --with-fips-enabled-file=PATH Link to fibs_enabled file (default: /proc/sys/crypto/fips_enabled)],
+ with_fips_enabled_file=$withval,
+ with_fips_enabled_file="/proc/sys/crypto/fips_enabled")
+ AC_MSG_RESULT([$with_fips_enabled_file])
+ AC_DEFINE_UNQUOTED([FIPS_ENABLED_FILE_LINK], ["$with_fips_enabled_file"])
+else
+ AC_MSG_RESULT(no)
+fi
+
dnl Check for Lua feature.
AC_MSG_CHECKING(--enable-luainterp argument)
AC_ARG_ENABLE(luainterp,
diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c
--- vim91/src/crypt.c.fips-warning 2025-10-10 07:16:11.000000000 +0200
+++ vim91/src/crypt.c 2025-10-31 08:12:59.598872032 +0100
@@ -806,6 +806,21 @@ crypt_check_method(int method)
msg_scroll = TRUE;
msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
}
+#ifdef HAVE_FIPS_WARNING
+ FILE *fips_enable_fd = fopen(FIPS_ENABLED_FILE_LINK, "r");
+ if (fips_enable_fd == NULL)
+ return;
+
+ int enabled = fgetc(fips_enable_fd);
+
+ if ( access(SYSTEM_FIPS_FILE_LINK, F_OK) != -1 && enabled == '1')
+ {
+ msg_scroll = TRUE;
+ msg(_("Warning: This cryptography is not FIPS 140-2 compliant."));
+ }
+
+ fclose(fips_enable_fd);
+#endif
}
/*

View file

@ -1,5 +0,0 @@
# Ensure vim is set as EDITOR if it isn't already set
if ( ! ($?EDITOR) ) then
setenv EDITOR "/usr/bin/vim"
endif

View file

@ -1,8 +0,0 @@
# Ensure vim is set as EDITOR if it isn't already set
# This is set as a universal variable so that any other definition
# by the user would win
# Cf. https://fishshell.com/docs/current/index.html#variables-scope
if ! set -q EDITOR;
set -x EDITOR /usr/bin/vim
end

View file

@ -1,5 +0,0 @@
# Ensure vim is set as EDITOR if it isn't already set
if [ -z "$EDITOR" ]; then
export EDITOR="/usr/bin/vim"
fi

View file

@ -1,7 +1,38 @@
diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
--- vim91/runtime/doc/vim.1.manpagefixes 2024-11-29 12:17:53.553382696 +0100
+++ vim91/runtime/doc/vim.1 2024-11-29 12:17:53.556382667 +0100
@@ -17,11 +17,13 @@ vim \- Vi IMproved, a programmer's text
diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man
--- vim73/runtime/doc/vim.man.rh1 2013-07-26 11:26:20.566576864 +0200
+++ vim73/runtime/doc/vim.man 2013-07-26 11:47:42.061351469 +0200
@@ -11,9 +11,9 @@ SYNOPSIS
vim [options] -t tag
vim [options] -q [errorfile]
- ex
+ ex gex
view
- gvim gview evim eview
+ gvim gview vimx evim eview
rvim rview rgvim rgview
DESCRIPTION
@@ -79,8 +79,13 @@ DESCRIPTION
the files. Can also be done with the "-R" argument.
gvim gview
- The GUI version. Starts a new window. Can also be done with
- the "-g" argument.
+ The GUI version. Starts a new window.
+
+ gex Starts a new gvim window in Ex mode. Can also be done with
+ the "-e" argument to gvim.
+
+ vimx Starts gvim in "Vi" mode similar to "vim", but with
+ additional features like xterm clipboard support.
evim eview
The GUI version in easy mode. Starts a new window. Can also
diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1
--- vim73/runtime/doc/vim.1 2013-07-31 14:13:01.039765800 +0200
+++ vim73_new/runtime/doc/vim.1 2013-07-31 13:57:59.861912768 +0200
@@ -17,11 +17,13 @@
.PP
.br
.B ex
@ -15,7 +46,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
.B evim
.B eview
.br
@@ -114,7 +116,12 @@ Can also be done with the "\-R" argument
@@ -114,7 +116,12 @@
gvim gview
The GUI version.
Starts a new window.
@ -29,7 +60,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
.TP
evim eview
The GUI version in easy mode.
@@ -491,6 +498,12 @@ As \-\-remote, but Vim does not exit unt
@@ -458,6 +458,12 @@
\-\-remote\-wait\-silent
As \-\-remote\-wait, but without the warning when no server is found.
.TP
@ -42,10 +73,10 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
\-\-serverlist
List the names of all Vim servers that can be found.
.TP
diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1
--- vim91/runtime/doc/vim-fr.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-fr.1 2024-11-29 12:17:53.556382667 +0100
@@ -24,11 +24,13 @@ vim \- Vi IMproved, 閐iteur de texte pou
diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1
--- vim73/runtime/doc/vim-fr.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vim-fr.1 2013-07-31 13:59:10.587467916 +0200
@@ -24,11 +24,13 @@
.PP
.br
.B ex
@ -59,10 +90,10 @@ diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1
.B evim
.B eview
.br
diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.UTF-8.1
--- vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-fr.UTF-8.1 2024-11-29 12:17:53.556382667 +0100
@@ -24,11 +24,13 @@ vim \- Vi IMproved, 茅diteur de texte po
diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1
--- vim73/runtime/doc/vim-fr.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vim-fr.UTF-8.1 2013-07-31 13:59:28.394852347 +0200
@@ -24,11 +24,13 @@
.PP
.br
.B ex
@ -76,10 +107,10 @@ diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.
.B evim
.B eview
.br
diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1
--- vim91/runtime/doc/vim-it.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-it.1 2024-11-29 12:17:53.557382658 +0100
@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi
diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1
--- vim73/runtime/doc/vim-it.1 2010-07-27 22:22:52.000000000 +0200
+++ vim73_new/runtime/doc/vim-it.1 2013-07-31 13:59:43.474331077 +0200
@@ -17,11 +17,13 @@
.PP
.br
.B ex
@ -93,10 +124,10 @@ diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1
.B evim
.B eview
.br
diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.UTF-8.1
--- vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-it.UTF-8.1 2024-11-29 12:17:53.557382658 +0100
@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi
diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1
--- vim73/runtime/doc/vim-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200
+++ vim73_new/runtime/doc/vim-it.UTF-8.1 2013-07-31 13:59:55.985898573 +0200
@@ -17,11 +17,13 @@
.PP
.br
.B ex
@ -110,41 +141,26 @@ diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.
.B evim
.B eview
.br
diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man
--- vim91/runtime/doc/vim.man.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim.man 2024-11-29 12:17:53.557382658 +0100
@@ -9,9 +9,9 @@ SYNOPSIS
vim [options] -t tag
vim [options] -q [errorfile]
diff -urN vim73/runtime/doc/vim.man vim73_new/runtime/doc/vim.man
--- vim73/runtime/doc/vim.man 2013-07-31 14:13:01.044765627 +0200
+++ vim73_new/runtime/doc/vim.man 2013-07-31 13:53:35.107064804 +0200
@@ -82,10 +82,10 @@
The GUI version. Starts a new window.
- ex
+ ex gex
view
- gvim gview evim eview
+ gvim gview vimx evim eview
rvim rview rgvim rgview
DESCRIPTION
@@ -77,8 +77,13 @@ DESCRIPTION
the files. Can also be done with the "-R" argument.
gvim gview
- The GUI version. Starts a new window. Can also be done with
- the "-g" argument.
+ The GUI version. Starts a new window.
+
+ gex Starts a new gvim window in Ex mode. Can also be done with
gex Starts a new gvim window in Ex mode. Can also be done with
- the "-e" argument to gvim.
+ the "-e" argument to gvim
+
+ vimx Starts gvim in "Vi" mode similar to "vim", but with
vimx Starts gvim in "Vi" mode similar to "vim", but with
- additional features like xterm clipboard support.
+ additional features like xterm clipboard support
evim eview
The GUI version in easy mode. Starts a new window. Can also
diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1
--- vim91/runtime/doc/vim-pl.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-pl.1 2024-11-29 12:17:53.557382658 +0100
@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla
diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1
--- vim73/runtime/doc/vim-pl.1 2010-05-15 13:04:01.000000000 +0200
+++ vim73_new/runtime/doc/vim-pl.1 2013-07-31 14:00:21.282024131 +0200
@@ -17,11 +17,13 @@
.PP
.br
.B ex
@ -158,10 +174,10 @@ diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1
.B evim
.B eview
.br
diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.UTF-8.1
--- vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-pl.UTF-8.1 2024-11-29 12:17:53.558382649 +0100
@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla
diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1
--- vim73/runtime/doc/vim-pl.UTF-8.1 2010-05-15 13:37:38.000000000 +0200
+++ vim73_new/runtime/doc/vim-pl.UTF-8.1 2013-07-31 14:00:36.056513402 +0200
@@ -17,11 +17,13 @@
.PP
.br
.B ex
@ -175,10 +191,10 @@ diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.
.B evim
.B eview
.br
diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1
--- vim91/runtime/doc/vim-ru.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-ru.1 2024-11-29 12:17:53.558382649 +0100
@@ -18,11 +18,13 @@
diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1
--- vim73/runtime/doc/vim-ru.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vim-ru.1 2013-07-31 14:01:10.071337568 +0200
@@ -17,11 +17,15 @@
.PP
.br
.B ex
@ -189,13 +205,15 @@ diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1
.B gvim
.B gview
+.B vimx
.B evim
.B eview
+.B evim
+.B eview
.br
diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.UTF-8.1
--- vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vim-ru.UTF-8.1 2024-11-29 12:17:53.558382649 +0100
@@ -18,11 +18,13 @@ 锌褉芯谐褉邪屑屑懈褋褌芯胁.
.B rvim
.B rview
diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1
--- vim73/runtime/doc/vim-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vim-ru.UTF-8.1 2013-07-31 14:01:34.494493301 +0200
@@ -17,11 +17,15 @@
.PP
.br
.B ex
@ -206,60 +224,62 @@ diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.
.B gvim
.B gview
+.B vimx
.B evim
.B eview
+.B evim
+.B eview
.br
diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1
--- vim91/runtime/doc/vimtutor.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vimtutor.1 2024-11-29 12:17:53.559382639 +0100
@@ -8,6 +8,8 @@ vimtutor \- the Vim tutor
.B vimtutor [\-h | \-\-help]
.B rvim
.B rview
diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1
--- vim73/runtime/doc/vimtutor.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor.1 2013-07-31 14:10:10.093671964 +0200
@@ -4,6 +4,8 @@
.SH SYNOPSIS
.br
.B vimtutor [\-\-list]
.B vimtutor [\-g] [language]
+.br
+.B gvimtutor
.SH DESCRIPTION
.B Vimtutor
starts the
diff -up vim91/runtime/doc/vimtutor-it.1.manpagefixes vim91/runtime/doc/vimtutor-it.1
--- vim91/runtime/doc/vimtutor-it.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vimtutor-it.1 2024-11-29 12:17:53.559382639 +0100
@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo
.B vimtutor [\-h | \-\-help]
diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1
--- vim73/runtime/doc/vimtutor-it.1 2010-07-27 22:35:32.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor-it.1 2013-07-31 14:10:33.564861055 +0200
@@ -4,6 +4,8 @@
.SH SINTASSI
.br
.B vimtutor [\-\-list]
.B vimtutor [\-g] [lingua]
+.br
+.B gvimtutor
.SH DESCRIZIONE
.B Vimtutor
inizia il
diff -up vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-it.UTF-8.1
--- vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vimtutor-it.UTF-8.1 2024-11-29 12:17:53.559382639 +0100
@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo
.B vimtutor [\-h | \-\-help]
diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-it.UTF-8.1
--- vim73/runtime/doc/vimtutor-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor-it.UTF-8.1 2013-07-31 14:10:40.483622016 +0200
@@ -4,6 +4,8 @@
.SH SINTASSI
.br
.B vimtutor [\-\-list]
.B vimtutor [\-g] [lingua]
+.br
+.B gvimtutor
.SH DESCRIZIONE
.B Vimtutor
inizia il
diff -up vim91/runtime/doc/vimtutor.man.manpagefixes vim91/runtime/doc/vimtutor.man
--- vim91/runtime/doc/vimtutor.man.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vimtutor.man 2024-11-29 12:17:53.559382639 +0100
@@ -8,6 +8,7 @@ SYNOPSIS
[ISO639]
vimtutor [-h | --help]
vimtutor [--list]
diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man
--- vim73/runtime/doc/vimtutor.man 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor.man 2013-07-31 14:11:04.786782356 +0200
@@ -7,6 +7,7 @@
SYNOPSIS
vimtutor [-g] [language]
+ gvimtutor
DESCRIPTION
Vimtutor starts the Vim tutor.
diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor-pl.1
--- vim91/runtime/doc/vimtutor-pl.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vimtutor-pl.1 2024-11-29 12:17:53.559382639 +0100
@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima
Vimtutor starts the Vim tutor. It copies the tutor file first, so that
diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1
--- vim73/runtime/doc/vimtutor-pl.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor-pl.1 2013-07-31 14:11:13.602477777 +0200
@@ -4,6 +4,8 @@
.SH SYNOPSIS
.br
.B vimtutor -g [jêzyk]
@ -268,10 +288,10 @@ diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor
.SH OPIS
.B Vimtutor
uruchamia nauczyciela
diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-pl.UTF-8.1
--- vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100
+++ vim91/runtime/doc/vimtutor-pl.UTF-8.1 2024-11-29 12:17:53.560382630 +0100
@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima
diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-pl.UTF-8.1
--- vim73/runtime/doc/vimtutor-pl.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor-pl.UTF-8.1 2013-07-31 14:11:20.571237009 +0200
@@ -4,6 +4,8 @@
.SH SYNOPSIS
.br
.B vimtutor -g [język]
@ -280,27 +300,27 @@ diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vi
.SH OPIS
.B Vimtutor
uruchamia nauczyciela
diff -up vim91/runtime/doc/vimtutor-ru.1.manpagefixes vim91/runtime/doc/vimtutor-ru.1
--- vim91/runtime/doc/vimtutor-ru.1.manpagefixes 2024-11-29 12:17:53.560382630 +0100
+++ vim91/runtime/doc/vimtutor-ru.1 2024-11-29 12:20:14.883047832 +0100
@@ -8,6 +8,8 @@
.B vimtutor [\-h | \-\-help]
diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1
--- vim73/runtime/doc/vimtutor-ru.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor-ru.1 2013-07-31 14:11:35.673715221 +0200
@@ -4,6 +4,8 @@
.SH 腼磲钿钺<E992BF> 篝蝻脶
.br
.B vimtutor [\-\-list]
.B vimtutor [掩偎]
+.br
+.B gvimtutor
.SH ïðéóáîéå
鹣 讼土文<EFBFBD>
土文<EFBFBD>
.B vimtutor
diff -up vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-ru.UTF-8.1
--- vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes 2024-11-29 12:17:53.560382630 +0100
+++ vim91/runtime/doc/vimtutor-ru.UTF-8.1 2024-11-29 12:19:27.318497067 +0100
@@ -11,6 +11,8 @@ 袩褉芯谐褉邪屑屑邪 vimtutor \[em] 胁褘锌
diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-ru.UTF-8.1
--- vim73/runtime/doc/vimtutor-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200
+++ vim73_new/runtime/doc/vimtutor-ru.UTF-8.1 2013-07-31 14:11:46.649335999 +0200
@@ -7,6 +7,8 @@
.SH ОПИСÐ<C2A1>Ð<EFBFBD>ИЕ
袩芯 泻芯屑邪薪写械
袣芯屑邪薪写邪
.B vimtutor
+.br
+.B gvimtutor
胁褘锌芯谢薪褟械褌褋褟 蟹邪锌褍褋泻 褉械写邪泻褌芯褉邪
蟹邪锌褍褋泻邪械褌 褍褔械斜薪懈泻 锌芯
.B Vim.
褋 蟹邪谐褉褍卸械薪薪褘屑 褎邪泄谢芯屑, 褋芯写械褉卸邪褖械屑 褌械泻褋褌 褍褔械斜薪懈泻邪.
袩褉懈 褝褌芯屑 褋薪邪褔邪谢邪 锌褉芯懈褋褏芯写懈褌 褋芯蟹写邪薪懈械 泻芯锌懈懈 褎邪泄谢邪 褍褔械斜薪懈泻邪,

View file

@ -1,16 +1,16 @@
diff -up vim82/runtime/tools/demoserver.py.python-tests vim82/runtime/tools/demoserver.py
--- vim82/runtime/tools/demoserver.py.python-tests 2019-07-26 07:58:50.000000000 +0200
+++ vim82/runtime/tools/demoserver.py 2020-04-17 06:18:06.748977527 +0200
diff -up vim80/runtime/tools/demoserver.py.python3-tests vim80/runtime/tools/demoserver.py
--- vim80/runtime/tools/demoserver.py.python3-tests 2018-05-11 08:24:41.774618804 +0200
+++ vim80/runtime/tools/demoserver.py 2018-05-11 09:24:48.363309856 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Server that will accept connections from a Vim channel.
# Run this server and then in Vim you can open the channel:
diff -up vim82/src/auto/configure.python-tests vim82/src/auto/configure
--- vim82/src/auto/configure.python-tests 2020-04-17 06:07:48.000000000 +0200
+++ vim82/src/auto/configure 2020-04-17 06:18:06.750977509 +0200
@@ -6418,7 +6418,7 @@ eof
diff -up vim80/src/auto/configure.python3-tests vim80/src/auto/configure
--- vim80/src/auto/configure.python3-tests 2018-05-11 08:25:03.632420873 +0200
+++ vim80/src/auto/configure 2018-05-11 09:25:26.062000471 +0200
@@ -6396,7 +6396,7 @@ eof
if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
vi_cv_path_python_plibs="-framework Python"
@ -19,10 +19,10 @@ diff -up vim82/src/auto/configure.python-tests vim82/src/auto/configure
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
fi
else
diff -up vim82/src/configure.ac.python-tests vim82/src/configure.ac
--- vim82/src/configure.ac.python-tests 2020-04-17 06:07:48.000000000 +0200
+++ vim82/src/configure.ac 2020-04-17 06:18:06.750977509 +0200
@@ -1263,7 +1263,7 @@ eof
diff -up vim80/src/configure.ac.python3-tests vim80/src/configure.ac
--- vim80/src/configure.ac.python3-tests 2018-05-11 08:25:26.070218957 +0200
+++ vim80/src/configure.ac 2018-05-11 09:26:01.603708243 +0200
@@ -1248,7 +1248,7 @@ eof
if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
vi_cv_path_python_plibs="-framework Python"
@ -31,54 +31,54 @@ diff -up vim82/src/configure.ac.python-tests vim82/src/configure.ac
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
fi
else
diff -up vim82/src/testdir/test_channel_pipe.py.python-tests vim82/src/testdir/test_channel_pipe.py
--- vim82/src/testdir/test_channel_pipe.py.python-tests 2019-07-26 07:58:53.000000000 +0200
+++ vim82/src/testdir/test_channel_pipe.py 2020-04-17 06:18:06.751977500 +0200
diff -up vim80/src/testdir/test_channel_pipe.py.python3-tests vim80/src/testdir/test_channel_pipe.py
--- vim80/src/testdir/test_channel_pipe.py.python3-tests 2018-05-11 09:23:05.738146018 +0200
+++ vim80/src/testdir/test_channel_pipe.py 2018-05-11 09:26:37.354413350 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Server that will communicate over stdin/stderr
#
diff -up vim82/src/testdir/test_channel.py.python-tests vim82/src/testdir/test_channel.py
--- vim82/src/testdir/test_channel.py.python-tests 2020-04-17 06:18:06.751977500 +0200
+++ vim82/src/testdir/test_channel.py 2020-04-17 06:18:24.517813082 +0200
diff -up vim80/src/testdir/test_channel.py.python3-tests vim80/src/testdir/test_channel.py
--- vim80/src/testdir/test_channel.py.python3-tests 2018-05-11 09:22:48.522284266 +0200
+++ vim80/src/testdir/test_channel.py 2018-05-11 09:26:17.762574955 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Server that will accept connections from a Vim channel.
# Used by test_channel.vim.
diff -up vim82/src/testdir/test_channel_write.py.python-tests vim82/src/testdir/test_channel_write.py
--- vim82/src/testdir/test_channel_write.py.python-tests 2019-07-26 07:58:53.000000000 +0200
+++ vim82/src/testdir/test_channel_write.py 2020-04-17 06:18:06.751977500 +0200
diff -up vim80/src/testdir/test_channel_write.py.python3-tests vim80/src/testdir/test_channel_write.py
--- vim80/src/testdir/test_channel_write.py.python3-tests 2018-05-11 09:23:21.254021422 +0200
+++ vim80/src/testdir/test_channel_write.py 2018-05-11 09:26:54.952268193 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Program that writes a number to stdout repeatedly
#
diff -up vim82/src/testdir/test_makeencoding.py.python-tests vim82/src/testdir/test_makeencoding.py
--- vim82/src/testdir/test_makeencoding.py.python-tests 2019-07-26 07:58:53.000000000 +0200
+++ vim82/src/testdir/test_makeencoding.py 2020-04-17 06:18:06.751977500 +0200
diff -up vim80/src/testdir/test_makeencoding.py.python3-tests vim80/src/testdir/test_makeencoding.py
--- vim80/src/testdir/test_makeencoding.py.python3-tests 2018-05-11 09:23:38.990878990 +0200
+++ vim80/src/testdir/test_makeencoding.py 2018-05-11 09:27:14.402107759 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
# Test program for :make, :grep and :cgetfile.
diff -up vim82/src/testdir/test_netbeans.py.python-tests vim82/src/testdir/test_netbeans.py
--- vim82/src/testdir/test_netbeans.py.python-tests 2019-07-26 07:58:53.000000000 +0200
+++ vim82/src/testdir/test_netbeans.py 2020-04-17 06:18:06.751977500 +0200
diff -up vim80/src/testdir/test_netbeans.py.python3-tests vim80/src/testdir/test_netbeans.py
--- vim80/src/testdir/test_netbeans.py.python3-tests 2018-05-11 09:23:54.398752732 +0200
+++ vim80/src/testdir/test_netbeans.py 2018-05-11 09:27:30.489975057 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
# Server that will communicate with Vim through the netbeans interface.
# Used by test_netbeans.vim.
diff -up vim82/src/testdir/test_short_sleep.py.python-tests vim82/src/testdir/test_short_sleep.py
--- vim82/src/testdir/test_short_sleep.py.python-tests 2019-07-26 07:58:53.000000000 +0200
+++ vim82/src/testdir/test_short_sleep.py 2020-04-17 06:18:06.751977500 +0200
diff -up vim80/src/testdir/test_short_sleep.py.python3-tests vim80/src/testdir/test_short_sleep.py
--- vim80/src/testdir/test_short_sleep.py.python3-tests 2018-05-11 09:24:09.134631798 +0200
+++ vim80/src/testdir/test_short_sleep.py 2018-05-11 09:27:48.432827053 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3

View file

@ -1,13 +1,11 @@
#!/bin/bash
debug=""
#debug="echo "
branches=( "rawhide" "f43" "f42" )
releases=( "fc44" "fc43" "fc42" )
# the first bodhi enabled release is the last without \| - all
# others need to have \|
regexps=( "fc44" "fc43" "\|fc42" )
branches=( "master" "f29" "f28" )
releases=( "fc30" "fc29" "fc28" )
regexps=( "fc30" "\|fc29" "\|fc28" )
bodhi_enabled=( "0" "1" "1" )
needs_update=()
branches_count=3
#releases_regexp=fc28\\\|fc27\\\|fc28
branches_index=0
@ -15,7 +13,7 @@ release_index=0
regexp_index=0
bodhi_enabled_index=0
done_build=0
releases_regexp=""
releases_regexp="${regexps[@]: regexp_index: 1}"
let "regexp_index+=1"
cd `dirname $0`
@ -77,8 +75,8 @@ mv dist/vim-${UPSTREAMMAJOR}.tar.bz2 dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.t
popd
cp -f vim-upstream/dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 .
#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/rawhide/ftplugin/spec.vim -O ftplugin-spec.vim
#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/rawhide/syntax/spec.vim -O syntax-spec.vim
#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/ftplugin/spec.vim -O ftplugin-spec.vim
#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/syntax/spec.vim -O syntax-spec.vim
if [ $CHANGES -ne 0 ]; then
CHLOG="* $DATE $PACKAGER -$EPOCH:$UPSTREAMMAJOR"
$debug sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC
@ -106,12 +104,23 @@ if [ $CHANGES -ne 0 ]; then
exit 1
fi
$debug fedpkg build
if [ $? -eq 0 ]; then
done_build=1
# Check if release has pending or testing update - if not, build package
# and submit update for testing
pending_update=`bodhi updates query --packages vim --status pending \
| grep $releases_regexp`
testing_update=`bodhi updates query --packages vim --status testing \
| grep $releases_regexp`
if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
$debug fedpkg build
if [ $? -eq 0 ]; then
done_build=1
else
echo "Error when building package in $branch"
exit 1
fi
else
echo "Error when building package in $branch"
exit 1
echo "There are pending/testing updates, do not build package."
fi
let "release_index+=1"
@ -123,9 +132,9 @@ if [ $CHANGES -ne 0 ]; then
$debug fedpkg switch-branch $branch
# merge with previous branch
$debug bash -c "git merge rawhide <<<':x'"
$debug bash -c "git merge ${branches[@]: $branches_index: 1} <<<':x'"
if [ $? -ne 0 ]; then
echo "Error: git merge rawhide"
echo "Error: git merge ${branches[@]: $branches_index: 1}"
exit 1
fi
@ -143,27 +152,24 @@ if [ $CHANGES -ne 0 ]; then
exit 1
fi
# append next release to regexp if the branch is enabled in bodhi - because we
# need to check if there aren't any testing updates from higher enabled branches
# (lower branch cannot have bigger NVR than higher branch) in next iteration
if [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]
then
releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}"
fi
# append next release to regexp - because we need to check if there aren't
# any testing updates from higher branches (lower branch cannot have
# bigger NVR than higher branch) in next iteration
releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}"
# Check if release has an update in testing - if not, build package
# Check if release has pending or testing update - if not, build package
# and submit update for testing
# done_build is a check, if previous branch did build - lower branch can do
# | grep $releases_regexp`
# done_build is checking, if previous branch did build - lower branch can do
# a build only when higher branch build was ok.
testing_update=`bodhi updates query --packages vim --status testing \
| grep $releases_regexp`
if [ "$testing_update" == "" ] && [ $done_build -eq 1 ]; then
$debug fedpkg build
if [ $? -eq 0 ]; then
# if branch isn't rawhide or branch is enabled in bodhi, create the update if newer branch does
# not have an update in testing
if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then
$debug bodhi updates new --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}
# if branch isn't master or branch is enabled in bodhi, create update
if [ $branch != "master" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then
$debug bodhi updates new --user zdohnal --type enhancement --notes "The newest upstream commit" --request testing --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}
fi
else
echo "Error when building package for $branch"
@ -189,11 +195,7 @@ if [ $CHANGES -ne 0 ]; then
#fi
fi
#go back to rawhide
$debug fedpkg switch-branch rawhide
# clean up the downloaded vim-upstream repo - to prevent changes in it and breaking update process
# prevents #1931099
$debug rm -rf vim-upstream
#go back to master
$debug fedpkg switch-branch master
exit 0

6
vim.csh Normal file
View file

@ -0,0 +1,6 @@
if ( -x /usr/bin/id ) then
if ( "`/usr/bin/id -u`" > 200 ) then
alias vi vim
endif
endif

5
vim.sh Normal file
View file

@ -0,0 +1,5 @@
if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; then
[ "`/usr/bin/id -u 2>/dev/null || echo 0`" -le 200 ] && return
# for bash and zsh, only if no alias is already set
alias vi >/dev/null 2>&1 || alias vi=vim
fi

2147
vim.spec

File diff suppressed because it is too large Load diff

86
vimrc
View file

@ -1,51 +1,15 @@
" When started as "evim", evim.vim will already have done these settings.
if v:progname =~? "evim"
finish
if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
set fileencodings=ucs-bom,utf-8,latin1
endif
" Use Vim settings, rather than Vi settings (much better!).
" This must be first, because it changes other options as a side effect.
" Avoid side effects when it was already reset.
if &compatible
set nocompatible
endif
" When the +eval feature is missing, the set command above will be skipped.
" Use a trick to reset compatible only when the +eval feature is missing.
silent! while 0
set nocompatible
silent! endwhile
" Allow backspacing over everything in insert mode.
set backspace=indent,eol,start
set nocompatible " Use Vim defaults (much better!)
set bs=indent,eol,start " allow backspacing over everything in insert mode
"set ai " always set autoindenting on
"set backup " keep a backup file
set viminfo='20,\"50 " read/write a .viminfo file, don't store more
" than 50 lines of registers
set history=50 " keep 50 lines of command line history
set ruler " show the cursor position all the time
set showcmd " display incomplete commands
set wildmenu " display completion matches in a status line
set ttimeout " time out for key codes
set ttimeoutlen=100 " wait up to 100ms after Esc for special key
" Show @@@ in the last line if it is truncated.
set display=truncate
" Show a few lines of context around the cursor. Note that this makes the
" text scroll if you mouse-click near the start or end of the window.
set scrolloff=5
" Do incremental searching when it's possible to timeout.
if has('reltime')
set incsearch
endif
" Do not recognize octal numbers for Ctrl-A and Ctrl-X, most users find it
" confusing.
set nrformats-=octal
" Only do this part when compiled with support for autocommands
if has("autocmd")
@ -54,21 +18,14 @@ if has("autocmd")
" In text files, always limit the width of text to 78 characters
" autocmd BufRead *.txt set tw=78
" When editing a file, always jump to the last cursor position
" (taken from Vim's defaults.vim)
autocmd BufReadPost *
\ let line = line("'\"")
\ | if line >= 1 && line <= line("$") && &filetype !~# 'commit'
\ && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1
\ && !&diff
\ | execute "normal! g`\""
\ | endif
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
\ exe "normal! g'\"" |
\ endif
" don't write swapfile on most commonly used directories for NFS mounts or USB sticks
autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
" start with spec file template
" 1724126 - do not open new file with .spec suffix with spec file template
" apparently there are other file types with .spec suffix, so disable the
" template
" autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
augroup END
endif
@ -90,12 +47,7 @@ endif
" Switch syntax highlighting on, when the terminal has colors
" Also switch on highlighting the last used search pattern.
if &t_Co > 2 || has("gui_running")
" Revert with ":syntax off".
syntax on
" I like highlighting strings inside C comments.
" Revert with ":unlet c_comment_strings".
let c_comment_strings=1
set hlsearch
endif
@ -107,26 +59,6 @@ if &term=="xterm"
set t_Sf=[3%dm
endif
" Convenient command to see the difference between the current buffer and the
" file it was loaded from, thus the changes you made.
" Only define it when not defined already.
" Revert with: ":delcommand DiffOrig".
if !exists(":DiffOrig")
command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
\ | wincmd p | diffthis
endif
if has('langmap') && exists('+langremap')
" Prevent that the langmap option applies to characters that result from a
" mapping. If set (default), this may break plugins (but it's backward
" compatible).
set nolangremap
endif
" Don't wake up system with blinking cursor:
" http://www.linuxpowertop.org/known.php
let &guicursor = &guicursor . ",a:blinkon0"
" Source a global configuration file if available
if filereadable("/etc/vimrc.local")
source /etc/vimrc.local
endif

3
virc
View file

@ -27,6 +27,9 @@ if has("autocmd")
augroup END
endif
filetype plugin on
if &term=="xterm"
set t_Co=8
set t_Sb=[4%dm

387
zip.vim Normal file
View file

@ -0,0 +1,387 @@
" 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