Merge branch 'f24' into f23
This commit is contained in:
Karsten Hopp
commit
3cbfb6ea04
3
.gitignore
vendored
3
.gitignore
vendored
@ -24,3 +24,6 @@ vim-7.2.tar.bz2
|
|||||||
/vim-7.4-1344.tar.bz2
|
/vim-7.4-1344.tar.bz2
|
||||||
/vim-7.4-1570.tar.bz2
|
/vim-7.4-1570.tar.bz2
|
||||||
/vim-7.4-1718.tar.bz2
|
/vim-7.4-1718.tar.bz2
|
||||||
|
/vim-7.4-1775.tar.bz2
|
||||||
|
/vim-7.4-1786.tar.bz2
|
||||||
|
/vim-7.4-1797.tar.bz2
|
||||||
|
|||||||
718
README.patches
718
README.patches
@ -1,3 +1,721 @@
|
|||||||
|
commit 3247fc9e85ec2067ebfd44d0e7efebce66f0aac2
|
||||||
|
Merge: f953813 c61348e
|
||||||
|
Author: Karsten Hopp <karsten@redhat.com>
|
||||||
|
Date: Fri Apr 29 11:43:48 2016 +0200
|
||||||
|
|
||||||
|
Merge branch 'master' of https://github.com/vim/vim
|
||||||
|
|
||||||
|
commit c61348e83fd4eed8b999fe5b7cdfb4caf90bf3fd
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 28 22:20:03 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1797
|
||||||
|
Problem: Warning from Windows 64 bit compiler.
|
||||||
|
Solution: Change int to size_t. (Mike Williams)
|
||||||
|
|
||||||
|
commit 283ee8b3a07b9da18f6c73f35cf465b83f96406a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 27 20:36:31 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1796
|
||||||
|
Problem: Colors are wrong on MS-Windows. (Christian Robinson)
|
||||||
|
Solution: Use existing RGB macro if it exists. (Ken Takata)
|
||||||
|
|
||||||
|
commit 5487544fa5d46af9f8f98aa4f5c59074a6e0639a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 22:33:17 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1795
|
||||||
|
Problem: Compiler warning for redefining RGB. (John Marriott)
|
||||||
|
Solution: Rename it to TORGB.
|
||||||
|
|
||||||
|
commit c285fe7c3ffdb3ec4eff20a1d1d5accfc80f1a86
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 21:51:48 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1794
|
||||||
|
Problem: Can't build on MS-Windows.
|
||||||
|
Solution: Add missing declaration.
|
||||||
|
|
||||||
|
commit e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 21:39:13 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1793
|
||||||
|
Problem: Some character classes may differ between systems. On OS/X the
|
||||||
|
regexp test fails.
|
||||||
|
Solution: Make this less dependent on the system. (idea by Kazunobu Kuriyama)
|
||||||
|
|
||||||
|
commit ab3022196ea4f1496e79b8ee85996e31c45d02f1
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 20:59:29 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1792
|
||||||
|
Problem: Color name decoding is implemented several times.
|
||||||
|
Solution: Move it to term.c. (Christian Brabandt)
|
||||||
|
|
||||||
|
commit 674127e1801fd02ff07dddf0dc3bf0d8cce68997
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 20:30:07 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1791
|
||||||
|
Problem: Channel could be garbage collected too early.
|
||||||
|
Solution: Don't free a channel or remove it from a job when it is still
|
||||||
|
useful.
|
||||||
|
|
||||||
|
commit 6231cb8b5b208becf088531816027001acc754e5
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 19:42:42 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1790
|
||||||
|
Problem: Leading white space in a job command matters. (Andrew Stewart)
|
||||||
|
Solution: Skip leading white space.
|
||||||
|
|
||||||
|
commit 437905c25d4cedfa16d0f87392e4a000d22362b7
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 19:01:05 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1789
|
||||||
|
Problem: Cannot use ch_read() in the close callback.
|
||||||
|
Solution: Do not discard the channel if there is readahead. Do not discard
|
||||||
|
readahead if there is a close callback.
|
||||||
|
|
||||||
|
commit c7baa43fdb3f5b001ba3e6eb05bf6e199698eeea
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 17:34:44 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1788
|
||||||
|
Problem: NSIS script is missing packages.
|
||||||
|
Solution: Add the missing directories. (Ken Takata)
|
||||||
|
|
||||||
|
commit b2658a1ab02cd0ba848164f70c7c464fdc398162
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 26 17:16:24 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1787
|
||||||
|
Problem: When a job ends the close callback is invoked before other
|
||||||
|
callbacks. On Windows the close callback is not called.
|
||||||
|
Solution: First invoke out/err callbacks before the close callback.
|
||||||
|
Make the close callback work on Windows.
|
||||||
|
|
||||||
|
commit f9538136beff21c04d8d7f8ad7f8d23ed0905771
|
||||||
|
Merge: b33f51a d10abe5
|
||||||
|
Author: Karsten Hopp <karsten@redhat.com>
|
||||||
|
Date: Tue Apr 26 13:09:13 2016 +0200
|
||||||
|
|
||||||
|
Merge branch 'master' of https://github.com/vim/vim
|
||||||
|
|
||||||
|
commit d10abe52019d10403eb559ea0a424bbd310b738f
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sun Apr 24 15:41:33 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1786
|
||||||
|
Problem: Compiled-in colors do not match rgb.txt.
|
||||||
|
Solution: Use the rgb.txt colors. (Kazunobu Kuriyama)
|
||||||
|
|
||||||
|
commit 490465bda6ab66f78041709cc02f48a25486a3e5
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sun Apr 24 15:11:02 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1785
|
||||||
|
Problem: Regexp test fails on windows.
|
||||||
|
Solution: set 'isprint' to the right value for testing.
|
||||||
|
|
||||||
|
commit 8e9eb3a6a1e589949f1c878c839528d917fdfc4a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sun Apr 24 15:00:11 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1784
|
||||||
|
Problem: The termtruecolor feature is enabled differently from many other
|
||||||
|
features.
|
||||||
|
Solution: Enable the termtruecolor feature for the big build, not through
|
||||||
|
configure.
|
||||||
|
|
||||||
|
commit af98a49dd0ef1661b4998f118151fddbf6e4df75
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sun Apr 24 14:40:12 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1783
|
||||||
|
Problem: The old regexp engine doesn't handle character classes correctly.
|
||||||
|
(Manuel Ortega)
|
||||||
|
Solution: Use regmbc() instead of regc(). Add a test.
|
||||||
|
|
||||||
|
commit fca66003053f8c0da5161d1fe4b75b3a389934b5
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sat Apr 23 15:30:09 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1782
|
||||||
|
Problem: strcharpart() does not work properly with some multi-byte
|
||||||
|
characters.
|
||||||
|
Solution: Use mb_cptr2len() instead of mb_char2len(). (Hirohito Higashi)
|
||||||
|
|
||||||
|
commit da5b3dcf06a3af5b398450258be32b0416451a9b
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sat Apr 23 15:19:02 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1781
|
||||||
|
Problem: synIDattr() does not respect 'guicolors'.
|
||||||
|
Solution: Change the conditition for the mode. (Christian Brabandt)
|
||||||
|
|
||||||
|
commit dc633cf82758f67f656cda7fa8ccc30414ee53f8
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sat Apr 23 14:33:19 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1780
|
||||||
|
Problem: Warnings reported by cppcheck.
|
||||||
|
Solution: Fix the warnings. (Dominique Pelle)
|
||||||
|
|
||||||
|
commit 73dfe917ba6357413aaf98a021c91add5ac6e9bc
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sat Apr 23 13:54:48 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1779
|
||||||
|
Problem: Using negative index in strcharpart(). (Yegappan Lakshmanan)
|
||||||
|
Solution: Assume single byte when using a negative iindex.
|
||||||
|
|
||||||
|
commit b2fa54a84078e2b8dc3c7c7bfbccf6b75c0788d0
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 21:11:09 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1778
|
||||||
|
Problem: When using the term truecolor feature, the t_8f and t_8b termcap
|
||||||
|
options are not set by default.
|
||||||
|
Solution: Move the values to before BT_EXTRA_KEYS. (Christian Brabandt)
|
||||||
|
|
||||||
|
commit 3849992b16011e36a5cb5be4b127f843389b96fd
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 20:46:52 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1777
|
||||||
|
Problem: Newly added features can escape the sandbox.
|
||||||
|
Solution: Add checks for restricted and secure. (Yasuhiro Matsumoto)
|
||||||
|
|
||||||
|
commit a1c487eef71d1673e57511453009de9cb4c9af51
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 20:20:19 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1776
|
||||||
|
Problem: Using wrong buffer length.
|
||||||
|
Solution: use the right name. (Kazunobu Kuriyama)
|
||||||
|
|
||||||
|
commit b33f51aac191c8831bebbc0ca5b0a49456fc0003
|
||||||
|
Merge: 8cf439c 763b684
|
||||||
|
Author: Karsten Hopp <karsten@redhat.com>
|
||||||
|
Date: Fri Apr 22 12:40:34 2016 +0200
|
||||||
|
|
||||||
|
Merge branch 'master' of https://github.com/vim/vim
|
||||||
|
|
||||||
|
commit 763b684373bf5954445d8d8d99da1e39a4fc5105
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 12:24:52 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1775
|
||||||
|
Problem: The rgb.txt file is not installed.
|
||||||
|
Solution: Install the file. (Christian Brabandt)
|
||||||
|
|
||||||
|
commit 902647d2dfb42dce8449dfbbc22dab27a528744d
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 11:49:06 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1774
|
||||||
|
Problem: Cterm true color feature has warnings.
|
||||||
|
Solution: Add type casts.
|
||||||
|
|
||||||
|
commit 380130f1e18da92a44372728fe044f56db58585b
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 11:24:43 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1773
|
||||||
|
Problem: Compiler warnings. (Dominique Pelle)
|
||||||
|
Solution: Add UNUSED. Add type cast. Avoid a buffer overflow.
|
||||||
|
|
||||||
|
commit 54a38415caa31de8b4ac46a9234ae339b1fd6255
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 10:14:07 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1772
|
||||||
|
Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty.
|
||||||
|
Solution: Add quotes. (Kazunobu Kuriyama)
|
||||||
|
|
||||||
|
commit 21decdd3e6d5ce3469a3c2743de1f4aada388d8c
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 22 10:00:58 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1771
|
||||||
|
Problem: Warning for unused variable.
|
||||||
|
Solution: Add #ifdef. (John Marriott)
|
||||||
|
|
||||||
|
commit 8a633e3427b47286869aa4b96f2bfc1fe65b25cd
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 21:10:14 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1770
|
||||||
|
Problem: Cannot use true color in the terminal.
|
||||||
|
Solution: Add the 'guicolors' option. (Nikolai Pavlov)
|
||||||
|
|
||||||
|
commit 6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 20:00:56 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1769
|
||||||
|
Problem: No "closed", "errors" and "encoding" attribute on Python output.
|
||||||
|
Solution: Add attributes and more tests. (Roland Puntaier, closes #622)
|
||||||
|
|
||||||
|
commit d106e5ba7f10f0d2a14eaefe5d78405044416cb9
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 19:38:07 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1768
|
||||||
|
Problem: Arguments of setqflist() are not checked properly.
|
||||||
|
Solution: Add better checks, add a test. (Nikolai Pavlov, Hirohito Higashi,
|
||||||
|
closes #661)
|
||||||
|
|
||||||
|
commit 4adfaabfe7e07da9546b45130cad0d266ba48611
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 18:20:11 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1767
|
||||||
|
Problem: When installing Vim on a GTK system the icon cache is not updated.
|
||||||
|
Solution: Update the GTK icon cache when possible. (Kazunobu Kuriyama)
|
||||||
|
|
||||||
|
commit 0c1ff16b5467f97ce08134fdbc8198127bbe492a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 18:01:28 2016 +0200
|
||||||
|
|
||||||
|
updated runtime files. Add avra syntax.
|
||||||
|
|
||||||
|
commit 02cfac85b4e4b038bb2df6962699fa93a42c7eb1
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 14:34:58 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1766
|
||||||
|
Problem: Building instructions for MS-Windows are outdated.
|
||||||
|
Solution: Mention setting SDK_INCLUDE_DIR. (Ben Franklin, closes #771) Move
|
||||||
|
outdated instructions further down.
|
||||||
|
|
||||||
|
commit 4694a17d1ec08382f996990a7fac1ac60197ec81
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 14:05:23 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1765
|
||||||
|
Problem: Undo options are not together in the options window.
|
||||||
|
Solution: Put them together. (Gary Johnson)
|
||||||
|
|
||||||
|
commit ba53435144f46eaaa53c63a62e748b3feee9742c
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 09:20:26 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1763
|
||||||
|
Problem: Coverity: useless assignment.
|
||||||
|
Solution: Add #if 0.
|
||||||
|
|
||||||
|
commit 268a06ce901d2c780304e0395028e3c2f60ec755
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 09:07:01 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1762
|
||||||
|
Problem: Coverity: useless assignments.
|
||||||
|
Solution: Remove them.
|
||||||
|
|
||||||
|
commit 8ed43916dbea4ccedcc84d271e292abbf658b9c5
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 08:56:12 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1761
|
||||||
|
Problem: Coverity complains about ignoring return value.
|
||||||
|
Solution: Add "(void)" to get rid of the warning.
|
||||||
|
|
||||||
|
commit aa3b15dbebf333282503d6031e2f9ba6ee4398ed
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 21 08:53:19 2016 +0200
|
||||||
|
|
||||||
|
Updated runtime files.
|
||||||
|
|
||||||
|
commit 4445f7ee708f1a1304526a5979c9dd9883a92a0a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 20:55:56 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1760
|
||||||
|
Problem: Compiler warning for unused variable.
|
||||||
|
Solution: Add #ifdef. (John Marriott)
|
||||||
|
|
||||||
|
commit 40b1b5443c88fab77f1f7c6f9e801f7ffdb7e0a8
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 20:18:23 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1759
|
||||||
|
Problem: When using feedkeys() in a timer the inserted characters are not
|
||||||
|
used right away.
|
||||||
|
Solution: Break the wait loop when characters have been added to typebuf.
|
||||||
|
use this for testing CursorHoldI.
|
||||||
|
|
||||||
|
commit 245c41070c7f37d52be43cce0cb140bd3ade6c7e
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 17:37:41 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1758
|
||||||
|
Problem: Triggering CursorHoldI when in CTRL-X mode causes problems.
|
||||||
|
Solution: Do not trigger CursorHoldI in CTRL-X mode. Add "!" flag to
|
||||||
|
feedkeys() (test with that didn't work though).
|
||||||
|
|
||||||
|
commit 8e42ae5069d4985869e46eaa56900ed19e30f504
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 16:39:19 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1757
|
||||||
|
Problem: When using complete() it may set 'modified' even though nothing
|
||||||
|
was inserted.
|
||||||
|
Solution: Use Down/Up instead of Next/Previous match. (Shougo, closes #745)
|
||||||
|
|
||||||
|
commit a6e42501424f6670fa864c739d2dc2eb764900b9
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 16:19:52 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1756
|
||||||
|
Problem: "dll" options are not expanded.
|
||||||
|
Solution: Expand environment variables. (Ozaki Kiichi)
|
||||||
|
|
||||||
|
commit 517ffbee0d5b7b46320726faaa330b61f54e867c
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 14:59:29 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1755
|
||||||
|
Problem: When using getreg() on a non-existing register a NULL list is
|
||||||
|
returned. (Bjorn Linse)
|
||||||
|
Solution: Allocate an empty list. Add a test.
|
||||||
|
|
||||||
|
commit c3691332f72169c486066200c0f3935418364900
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 12:49:49 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1754
|
||||||
|
Problem: When 'filetype' was set and reloading a buffer which does not
|
||||||
|
cause it to be set, the syntax isn't loaded. (KillTheMule)
|
||||||
|
Solution: Remember whether the FileType event was fired and fire it if not.
|
||||||
|
(Anton Lindqvist, closes #747)
|
||||||
|
|
||||||
|
commit c020042083b9c0a4e932b562c3bef97c76328e18
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 20 12:02:02 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1753
|
||||||
|
Problem: "noinsert" in 'completeopt' is sometimes ignored.
|
||||||
|
Solution: Set the variables when the 'completeopt' was set. (Ozaki Kiichi)
|
||||||
|
|
||||||
|
commit 8d8aa0a367380f23f0af428fcb66a1a0615bf872
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 18 20:21:12 2016 +0200
|
||||||
|
|
||||||
|
Add missing test file.
|
||||||
|
|
||||||
|
commit c1808d5822ed9534ef7f0fe509b15bee92a5cc28
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 18 20:04:00 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1752
|
||||||
|
Problem: When adding to the quickfix list the current position is reset.
|
||||||
|
Solution: Do not reset the position when not needed. (Yegappan Lakshmanan)
|
||||||
|
|
||||||
|
commit def5abe0a2727041ecee69afdccfca405333bd24
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 18 19:46:15 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1751
|
||||||
|
Problem: Crash when 'tagstack' is off. (Dominique Pelle)
|
||||||
|
Solution: Fix it. (Hirohito Higashi)
|
||||||
|
|
||||||
|
commit 7f7c3325d3f1baba32263a3457cfc4d90ecd5ff1
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 18 19:27:24 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1750
|
||||||
|
Problem: When a buffer gets updated while in command line mode, the screen
|
||||||
|
may be messed up.
|
||||||
|
Solution: Postpone the redraw when the screen is scrolled.
|
||||||
|
|
||||||
|
commit 30e12d259ee78272359f9da2655d0593a4f6a626
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sun Apr 17 20:49:53 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1749
|
||||||
|
Problem: When using GTK 3.20 there are a few warnings.
|
||||||
|
Solution: Use new functions when available. (Kazunobu Kuriyama)
|
||||||
|
|
||||||
|
commit f9660b59b2bdaa3ec2e7b31ab52186ad8b99f047
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sat Apr 16 22:19:15 2016 +0200
|
||||||
|
|
||||||
|
Add missing test file.
|
||||||
|
|
||||||
|
commit 1538fc34fae3fae39773ca43f6ff52401fce61d8
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sat Apr 16 09:13:34 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1748
|
||||||
|
Problem: "gD" does not find match in first column of first line. (Gary
|
||||||
|
Johnson)
|
||||||
|
Solution: Accept match at the cursor.
|
||||||
|
|
||||||
|
commit fe4b18640656ddea41f60cf7a76956c9cc5494d6
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 15 21:47:54 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1747
|
||||||
|
Problem: Coverity: missing check for NULL pointer.
|
||||||
|
Solution: Check for out of memory.
|
||||||
|
|
||||||
|
commit 95509e18f8806046eeee27482c77666bbec515da
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 15 21:16:11 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1746
|
||||||
|
Problem: Memory leak in Perl.
|
||||||
|
Solution: Decrement the reference count. Add a test. (Damien)
|
||||||
|
|
||||||
|
commit 5d98c9d93278d6961bfee59151666b8a8bcd23c3
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 15 20:54:52 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1745
|
||||||
|
Problem: README file is not clear about where to get Vim.
|
||||||
|
Solution: Add links to github, releases and the Windows installer.
|
||||||
|
(Suggested by Christian Brabandt)
|
||||||
|
|
||||||
|
commit 66210042892389d36e3d37203ec77f61467bfb1c
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 15 20:40:41 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1744
|
||||||
|
Problem: Python: Converting a sequence may leak memory.
|
||||||
|
Solution: Decrement a reference. (Nikolay Pavlov)
|
||||||
|
|
||||||
|
commit 75be2339d877bbd38df91c0181e1e0e388852df6
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 23:10:40 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1743
|
||||||
|
Problem: Clang warns for uninitialzed variable. (Michael Jarvis)
|
||||||
|
Solution: Initialize it.
|
||||||
|
|
||||||
|
commit 5d18e0eca59ffbba22c7f7c91c9f99d672095728
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 22:54:24 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1742
|
||||||
|
Problem: strgetchar() does not work correctly.
|
||||||
|
Solution: use mb_cptr2len(). Add a test. (Naruhiko Nishino)
|
||||||
|
|
||||||
|
commit b22bd46b9681d73d095f2eadff8163d3a6cf416b
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 22:52:50 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1741
|
||||||
|
Problem: Not testing utf-8 characters.
|
||||||
|
Solution: Move the right asserts to the test_expr_utf8 test.
|
||||||
|
|
||||||
|
commit 4d585022023b96f6507e8cae5ed8fc8d926f5140
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 19:50:22 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1740
|
||||||
|
Problem: syn-cchar defined with matchadd() does not appear if there are no
|
||||||
|
other syntax definitions which matches buffer text.
|
||||||
|
Solution: Check for startcol. (Ozaki Kiichi, haya14busa, closes #757)
|
||||||
|
|
||||||
|
commit bea1ede1c59a11ca5bf9d91cd30b7b2937b9fb41
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 19:44:36 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1739
|
||||||
|
Problem: Messages test fails on MS-Windows.
|
||||||
|
Solution: Adjust the asserts. Skip the "messages maintainer" line if not
|
||||||
|
showing all messages.
|
||||||
|
|
||||||
|
commit 5d91646599a7b74310845e30a2a52ff197dc0ed7
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 18:42:47 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1738
|
||||||
|
Problem: Count for ":messages" depends on number of lines.
|
||||||
|
Solution: Add ADDR_OTHER address type.
|
||||||
|
|
||||||
|
commit 52196b2dbe3b64b5054e1df3d3aa8fc65e30addc
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 17:52:41 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1737
|
||||||
|
Problem: Argument marked as unused is used.
|
||||||
|
Solution: Remove UNUSED.
|
||||||
|
|
||||||
|
commit baa9fcaf4042a6dbe01e64ce63cb54941ee00f09
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 17:40:56 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1736
|
||||||
|
Problem: Unused variable.
|
||||||
|
Solution: Remove it. (Yasuhiro Matsumoto)
|
||||||
|
|
||||||
|
commit 451f849fd6282a4facd4f0f58af62837443fb5a6
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 17:16:22 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1735
|
||||||
|
Problem: It is not possible to only see part of the message history. It is
|
||||||
|
not possible to clear messages.
|
||||||
|
Solution: Add a count to ":messages" and a clear argument. (Yasuhiro
|
||||||
|
Matsumoto)
|
||||||
|
|
||||||
|
commit 0f518a8f4d4be4cac10389680f6bd5e3781f94b0
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 16:57:10 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1734
|
||||||
|
Problem: Test fails when not using utf-8.
|
||||||
|
Solution: Split test in regularand utf-8 part.
|
||||||
|
|
||||||
|
commit 839e954aaa72ef62f65416d177f829e681c15466
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 16:46:02 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1733
|
||||||
|
Problem: "make install" doesn't know about cross-compiling. (Christian
|
||||||
|
Neukirchen)
|
||||||
|
Solution: Add CROSS_COMPILING. (closes #740)
|
||||||
|
|
||||||
|
commit 429fcfbf9a9275367fe9441a50a3dcd773497d84
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 16:22:04 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1732
|
||||||
|
Problem: Folds may close when using autocomplete. (Anmol Sethi)
|
||||||
|
Solution: Increment/decrement disable_fold. (Christian Brabandt, closes
|
||||||
|
#643)
|
||||||
|
|
||||||
|
commit 8110a091bc749d8748a20807a724a3af3ca6d509
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 15:56:09 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1731
|
||||||
|
Problem: Python: turns partial into simple funcref.
|
||||||
|
Solution: Use partials like partials. (Nikolai Pavlov, closes #734)
|
||||||
|
|
||||||
|
commit 58de0e2dcc1f2d251b74892a06d71a14973f3187
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 15:13:46 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1730
|
||||||
|
Problem: It is not easy to get a character out of a string.
|
||||||
|
Solution: Add strgetchar() and strcharpart().
|
||||||
|
|
||||||
|
commit 6244a0fc29163ba1c734f92b55a89e01e6cf2a67
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 14:09:25 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1729
|
||||||
|
Problem: The Perl interface cannot use 'print' operator for writing
|
||||||
|
directly in standard IO.
|
||||||
|
Solution: Add a minimal implementation of PerlIO Layer feature and try to
|
||||||
|
use it for STDOUT/STDERR. (Damien)
|
||||||
|
|
||||||
|
commit 81edd171a9465cf99cede4fa4a7b7bca3d538b0f
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 13:51:37 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1728
|
||||||
|
Problem: The help for functions require a space after the "(".
|
||||||
|
Solution: Make CTRL-] on a function name ignore the arguments. (Hirohito
|
||||||
|
Higashi)
|
||||||
|
|
||||||
|
commit ebf7dfa6f121c82f97d2adca3d45fbaba9ad8f7e
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Thu Apr 14 12:46:51 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1727
|
||||||
|
Problem: Cannot detect a crash in tests when caused by garbagecollect().
|
||||||
|
Solution: Add garbagecollect_for_testing(). Do not free a job if is still
|
||||||
|
useful.
|
||||||
|
|
||||||
|
commit 700eefe5a4385fd128f5496e3ca384869752376a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Wed Apr 13 21:14:37 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1726
|
||||||
|
Problem: ANSI compiler complains about string length.
|
||||||
|
Solution: Split long string in two parts. (Michael Jarvis)
|
||||||
|
|
||||||
|
commit 3780bb923a688e0051a9a23474eeb38a8acb695a
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 12 22:18:53 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1725
|
||||||
|
Problem: Compiler errors for non-ANSI compilers.
|
||||||
|
Solution: Remove // comment. Remove comma at end of enum. (Michael Jarvis)
|
||||||
|
|
||||||
|
commit 03413f44167c4b5cd0012def9bb331e2518c83cf
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Tue Apr 12 21:07:15 2016 +0200
|
||||||
|
|
||||||
|
Updated runtime files.
|
||||||
|
|
||||||
|
commit 73cd8fb3e87e4b29dfc489f58e56dee1839c18e5
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 11 22:49:03 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1724
|
||||||
|
Problem: Tabline test fails in GUI.
|
||||||
|
Solution: Remove 'e' from 'guioptions'.
|
||||||
|
|
||||||
|
commit f73d3bc253fa79ad220f52f04b93e782e95a9d43
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 11 21:55:15 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1723
|
||||||
|
Problem: When using try/catch in 'tabline' it is still considered an
|
||||||
|
error and the tabline will be disabled.
|
||||||
|
Solution: Check did_emsg instead of called_emsg. (haya14busa, closes #746)
|
||||||
|
|
||||||
|
commit 0239acb11fe4bfe9b525ea90b782759da5eb7704
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Mon Apr 11 21:02:54 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1722
|
||||||
|
Problem: Crash when calling garbagecollect() after starting a job.
|
||||||
|
Solution: Set the copyID on job and channel. (Hirohito Higashi, Ozaki
|
||||||
|
Kiichi)
|
||||||
|
|
||||||
|
commit 939a1abe935a539f2d4c90a56cb0682cbaf3bbb0
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Sun Apr 10 01:31:25 2016 +0200
|
||||||
|
|
||||||
|
Updated runtime files.
|
||||||
|
|
||||||
|
commit a4d13de8363abf4c12fe99a52b4e49e763de92fe
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 8 22:17:04 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1721
|
||||||
|
Problem: The vimtbar files are unused.
|
||||||
|
Solution: Remove them. (Ken Takata)
|
||||||
|
|
||||||
|
commit 9e4043757cd2fc18d071fdd98abf297d74878943
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 8 17:25:19 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1720
|
||||||
|
Problem: Tests fail without the job feature.
|
||||||
|
Solution: Skip tests when the job feature is not present.
|
||||||
|
|
||||||
|
commit 107e1eef1df3b786ad3ad49fbdb9e058649303b5
|
||||||
|
Author: Bram Moolenaar <Bram@vim.org>
|
||||||
|
Date: Fri Apr 8 17:07:19 2016 +0200
|
||||||
|
|
||||||
|
patch 7.4.1719
|
||||||
|
Problem: Leaking memory when there is a cycle involving a job and a
|
||||||
|
partial.
|
||||||
|
Solution: Add a copyID to job and channel. Set references in items referred
|
||||||
|
by them. Go through all jobs and channels to find unreferenced
|
||||||
|
items. Also, decrement reference counts when garbage collecting.
|
||||||
|
|
||||||
commit 8cf439cb8003c79addd36cc2c6d1dcc42652f3f2
|
commit 8cf439cb8003c79addd36cc2c6d1dcc42652f3f2
|
||||||
Merge: d8dc5e6 d56374e
|
Merge: d8dc5e6 d56374e
|
||||||
Author: Karsten Hopp <karsten@redhat.com>
|
Author: Karsten Hopp <karsten@redhat.com>
|
||||||
|
|||||||
1
macros.vim
Normal file
1
macros.vim
Normal file
@ -0,0 +1 @@
|
|||||||
|
%vimfiles_root %{_datadir}/vim/vimfiles
|
||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
47f1f3468b5ee8fe59a8df97bbe8e6c5 vim-7.4-1718.tar.bz2
|
604fae227404a29eb6881159b7052e04 vim-7.4-1797.tar.bz2
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
--- vim64/runtime/syntax/spec.vim.check 2005-10-25 13:18:57.000000000 +0200
|
|
||||||
+++ vim64/runtime/syntax/spec.vim 2005-10-25 13:20:06.000000000 +0200
|
|
||||||
@@ -114,7 +114,7 @@
|
|
||||||
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\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' 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\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' 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
|
|
||||||
@ -10,12 +10,3 @@ diff -up vim73/runtime/doc/vim.1.668894 vim73/runtime/doc/vim.1
|
|||||||
.TP
|
.TP
|
||||||
\-t {tag}
|
\-t {tag}
|
||||||
The file to edit and the initial cursor position depends on a "tag", a sort
|
The file to edit and the initial cursor position depends on a "tag", a sort
|
||||||
@@ -321,7 +321,7 @@ When N is omitted, open one tab page for
|
|
||||||
\-R
|
|
||||||
Read-only mode.
|
|
||||||
The 'readonly' option will be set.
|
|
||||||
-You can still edit the buffer, but will be prevented from accidently
|
|
||||||
+You can still edit the buffer, but will be prevented from accidentally
|
|
||||||
overwriting a file.
|
|
||||||
If you do want to overwrite a file, add an exclamation mark to the Ex command,
|
|
||||||
as in ":w!".
|
|
||||||
|
|||||||
14
vim-7.4-releasestring-1318991.patch
Normal file
14
vim-7.4-releasestring-1318991.patch
Normal 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-04-26 13:01:33.781838194 +0200
|
||||||
|
+++ vim74/runtime/ftplugin/spec.vim 2016-04-26 13:02:41.958130012 +0200
|
||||||
|
@@ -40,8 +40,8 @@ else:
|
||||||
|
headers = spec.packages[0].header
|
||||||
|
version = headers['Version']
|
||||||
|
release = ".".join(headers['Release'].split(".")[:-1])
|
||||||
|
- vim.command("let ver = " + version)
|
||||||
|
- vim.command("let rel = " + release)
|
||||||
|
+ vim.command("let ver = '" + version + "'")
|
||||||
|
+ vim.command("let rel = '" + release + "'")
|
||||||
|
PYEND
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
14
vim-7.4-spec_rfc822.patch
Normal file
14
vim-7.4-spec_rfc822.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up vim74/runtime/ftplugin/spec.vim.rfc822 vim74/runtime/ftplugin/spec.vim
|
||||||
|
--- vim74/runtime/ftplugin/spec.vim.rfc822 2016-04-13 12:31:09.856418963 +0200
|
||||||
|
+++ vim74/runtime/ftplugin/spec.vim 2016-04-13 12:32:22.091802791 +0200
|
||||||
|
@@ -113,7 +113,10 @@ if !exists("*s:SpecChangelog")
|
||||||
|
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
|
||||||
80
vim.spec
80
vim.spec
@ -1,4 +1,4 @@
|
|||||||
%define patchlevel 1718
|
%define patchlevel 1797
|
||||||
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
|
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
|
||||||
%define WITH_SELINUX 1
|
%define WITH_SELINUX 1
|
||||||
%endif
|
%endif
|
||||||
@ -25,7 +25,8 @@ Release: 1%{?dist}
|
|||||||
License: Vim
|
License: Vim
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
|
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
|
||||||
Source3: gvim.desktop
|
Source2: gvim.desktop
|
||||||
|
Source3: vimrc
|
||||||
Source4: vimrc
|
Source4: vimrc
|
||||||
Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
|
Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
|
||||||
Source7: gvim16.png
|
Source7: gvim16.png
|
||||||
@ -39,6 +40,7 @@ Source13: vim-spell-files.tar.bz2
|
|||||||
%endif
|
%endif
|
||||||
Source14: spec-template
|
Source14: spec-template
|
||||||
Source15: spec-template.new
|
Source15: spec-template.new
|
||||||
|
Source16: macros.vim
|
||||||
|
|
||||||
Patch2002: vim-7.0-fixkeys.patch
|
Patch2002: vim-7.0-fixkeys.patch
|
||||||
Patch2003: vim-6.2-specsyntax.patch
|
Patch2003: vim-6.2-specsyntax.patch
|
||||||
@ -58,6 +60,8 @@ Patch3010: vim-7.3-manpage-typo-668894-675480.patch
|
|||||||
Patch3011: vim-manpagefixes-948566.patch
|
Patch3011: vim-manpagefixes-948566.patch
|
||||||
Patch3012: vim-7.4-licensemacro-1151450.patch
|
Patch3012: vim-7.4-licensemacro-1151450.patch
|
||||||
Patch3013: vim-7.4-globalsyntax.patch
|
Patch3013: vim-7.4-globalsyntax.patch
|
||||||
|
Patch3014: vim-7.4-spec_rfc822.patch
|
||||||
|
Patch3015: vim-7.4-releasestring-1318991.patch
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
|
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
|
||||||
@ -209,6 +213,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
|||||||
%patch3011 -p1
|
%patch3011 -p1
|
||||||
%patch3012 -p1
|
%patch3012 -p1
|
||||||
%patch3013 -p1
|
%patch3013 -p1
|
||||||
|
%patch3014 -p1
|
||||||
|
%patch3015 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cp -f %{SOURCE5} .
|
cp -f %{SOURCE5} .
|
||||||
@ -224,8 +230,8 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOU
|
|||||||
cp -f os_unix.h os_unix.h.save
|
cp -f os_unix.h os_unix.h.save
|
||||||
cp -f ex_cmds.c ex_cmds.c.save
|
cp -f ex_cmds.c ex_cmds.c.save
|
||||||
|
|
||||||
perl -pi -e "s/help.txt/vi_help.txt/" os_unix.h ex_cmds.c
|
#perl -pi -e "s/help.txt/vi_help.txt/" os_unix.h ex_cmds.c
|
||||||
perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/" os_unix.h
|
perl -pi -e "s/vimrc/virc/" os_unix.h
|
||||||
%configure --prefix=%{_prefix} --with-features=small --with-x=no \
|
%configure --prefix=%{_prefix} --with-features=small --with-x=no \
|
||||||
--enable-multibyte \
|
--enable-multibyte \
|
||||||
--disable-netbeans \
|
--disable-netbeans \
|
||||||
@ -249,7 +255,7 @@ mv -f ex_cmds.c.save ex_cmds.c
|
|||||||
%configure --with-features=huge \
|
%configure --with-features=huge \
|
||||||
--enable-pythoninterp=dynamic \
|
--enable-pythoninterp=dynamic \
|
||||||
--enable-python3interp=dynamic \
|
--enable-python3interp=dynamic \
|
||||||
--enable-perlinterp \
|
--enable-perlinterp=dynamic \
|
||||||
--disable-tclinterp --with-x=yes \
|
--disable-tclinterp --with-x=yes \
|
||||||
--enable-xim --enable-multibyte \
|
--enable-xim --enable-multibyte \
|
||||||
--with-tlib=ncurses \
|
--with-tlib=ncurses \
|
||||||
@ -276,6 +282,7 @@ mv -f ex_cmds.c.save ex_cmds.c
|
|||||||
%else
|
%else
|
||||||
--disable-luainterp \
|
--disable-luainterp \
|
||||||
%endif
|
%endif
|
||||||
|
--enable-termtruecolor
|
||||||
|
|
||||||
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
||||||
cp vim gvim
|
cp vim gvim
|
||||||
@ -284,7 +291,7 @@ make clean
|
|||||||
%configure --prefix=%{_prefix} --with-features=huge \
|
%configure --prefix=%{_prefix} --with-features=huge \
|
||||||
--enable-pythoninterp=dynamic \
|
--enable-pythoninterp=dynamic \
|
||||||
--enable-python3interp=dynamic \
|
--enable-python3interp=dynamic \
|
||||||
--enable-perlinterp \
|
--enable-perlinterp=dynamic \
|
||||||
--disable-tclinterp \
|
--disable-tclinterp \
|
||||||
--with-x=no \
|
--with-x=no \
|
||||||
--enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \
|
--enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \
|
||||||
@ -311,6 +318,7 @@ make clean
|
|||||||
%else
|
%else
|
||||||
--disable-luainterp \
|
--disable-luainterp \
|
||||||
%endif
|
%endif
|
||||||
|
--enable-termtruecolor
|
||||||
|
|
||||||
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
||||||
cp vim enhanced-vim
|
cp vim enhanced-vim
|
||||||
@ -409,11 +417,11 @@ EOF
|
|||||||
--vendor fedora \
|
--vendor fedora \
|
||||||
%endif
|
%endif
|
||||||
--dir %{buildroot}/%{_datadir}/applications \
|
--dir %{buildroot}/%{_datadir}/applications \
|
||||||
%{SOURCE3}
|
%{SOURCE2}
|
||||||
# --add-category "Development;TextEditor;X-Red-Hat-Base" D\
|
# --add-category "Development;TextEditor;X-Red-Hat-Base" D\
|
||||||
%else
|
%else
|
||||||
mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
|
mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
|
||||||
cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
|
cp %{SOURCE2} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
|
||||||
%endif
|
%endif
|
||||||
# ja_JP.ujis is obsolete, ja_JP.eucJP is recommended.
|
# ja_JP.ujis is obsolete, ja_JP.eucJP is recommended.
|
||||||
( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \
|
( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \
|
||||||
@ -468,21 +476,26 @@ if ( -x /usr/bin/id ) then
|
|||||||
endif
|
endif
|
||||||
EOF
|
EOF
|
||||||
chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/*
|
chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/*
|
||||||
|
install -p -m644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/virc
|
||||||
install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/vimrc
|
install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/vimrc
|
||||||
install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
|
|
||||||
|
mkdir -p %{buildroot}%{_libdir}/%{name}
|
||||||
|
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
|
||||||
|
install -p -m644 %{SOURCE16} %{buildroot}%{_rpmconfigdir}/macros.d/
|
||||||
|
|
||||||
(cd %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc;
|
(cd %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc;
|
||||||
gzip -9 *.txt
|
# gzip -9 *.txt
|
||||||
gzip -d help.txt.gz version7.txt.gz sponsor.txt.gz
|
# gzip -d help.txt.gz version7.txt.gz sponsor.txt.gz
|
||||||
cp %{SOURCE12} .
|
# cp %{SOURCE12} .
|
||||||
cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/;s/\tversion7.txt.gz\t/\tversion7.txt\t/;s/\tsponsor.txt.gz\t/\tsponsor.txt\t/' > tags.new; mv -f tags.new tags
|
# cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/;s/\tversion7.txt.gz\t/\tversion7.txt\t/;s/\tsponsor.txt.gz\t/\tsponsor.txt\t/' > tags.new; mv -f tags.new tags
|
||||||
cat >> tags << EOF
|
#cat >> tags << EOF
|
||||||
vi_help.txt vi_help.txt /*vi_help.txt*
|
#vi_help.txt vi_help.txt /*vi_help.txt*
|
||||||
vi-author.txt vi_help.txt /*vi-author*
|
#vi-author.txt vi_help.txt /*vi-author*
|
||||||
vi-Bram.txt vi_help.txt /*vi-Bram*
|
#vi-Bram.txt vi_help.txt /*vi-Bram*
|
||||||
vi-Moolenaar.txt vi_help.txt /*vi-Moolenaar*
|
#vi-Moolenaar.txt vi_help.txt /*vi-Moolenaar*
|
||||||
vi-credits.txt vi_help.txt /*vi-credits*
|
#vi-credits.txt vi_help.txt /*vi-credits*
|
||||||
EOF
|
#EOF
|
||||||
LANG=C sort tags > tags.tmp; mv tags.tmp tags
|
#LANG=C sort tags > tags.tmp; mv tags.tmp tags
|
||||||
)
|
)
|
||||||
(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;)
|
(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;)
|
||||||
rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
|
rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
|
||||||
@ -552,6 +565,7 @@ rm -rf %{buildroot}
|
|||||||
%dir %{_datadir}/%{name}
|
%dir %{_datadir}/%{name}
|
||||||
%{_datadir}/%{name}/vimfiles/template.spec
|
%{_datadir}/%{name}/vimfiles/template.spec
|
||||||
%dir %{_datadir}/%{name}/%{vimdir}
|
%dir %{_datadir}/%{name}/%{vimdir}
|
||||||
|
%{_datadir}/%{name}/%{vimdir}/rgb.txt
|
||||||
%{_datadir}/%{name}/%{vimdir}/autoload
|
%{_datadir}/%{name}/%{vimdir}/autoload
|
||||||
%{_datadir}/%{name}/%{vimdir}/colors
|
%{_datadir}/%{name}/%{vimdir}/colors
|
||||||
%{_datadir}/%{name}/%{vimdir}/compiler
|
%{_datadir}/%{name}/%{vimdir}/compiler
|
||||||
@ -714,6 +728,8 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%files filesystem
|
%files filesystem
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%{_rpmconfigdir}/macros.d/macros.vim
|
||||||
|
%dir %{_libdir}/%{name}
|
||||||
%dir %{_datadir}/%{name}/vimfiles
|
%dir %{_datadir}/%{name}/vimfiles
|
||||||
%dir %{_datadir}/%{name}/vimfiles/after
|
%dir %{_datadir}/%{name}/vimfiles/after
|
||||||
%dir %{_datadir}/%{name}/vimfiles/after/*
|
%dir %{_datadir}/%{name}/vimfiles/after/*
|
||||||
@ -753,6 +769,28 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/icons/hicolor/*/apps/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 29 2016 Karsten Hopp <karsten@redhat.com> 7.4.1797-1
|
||||||
|
- patchlevel 1797
|
||||||
|
|
||||||
|
* Fri Apr 29 2016 Karsten Hopp <karsten@redhat.com> - 7.4.1786-1
|
||||||
|
- dynamically load perl when needed (rhbz#1327755)
|
||||||
|
|
||||||
|
* Tue Apr 26 2016 Karsten Hopp <karsten@redhat.com> 7.4.1786-1
|
||||||
|
- patchlevel 1786
|
||||||
|
|
||||||
|
* Tue Apr 26 2016 Karsten Hopp <karsten@redhat.com> - 7.4.1775-2
|
||||||
|
- fix error in spec.vim (rhbz#1318991)
|
||||||
|
|
||||||
|
* Fri Apr 22 2016 Karsten Hopp <karsten@redhat.com> 7.4.1775-1
|
||||||
|
- patchlevel 1775
|
||||||
|
|
||||||
|
* Tue Apr 12 2016 Karsten Hopp <karsten@redhat.com> - 7.4.1718-2
|
||||||
|
- add vimfiles_root macro (rhbz#844975)
|
||||||
|
- add %%_libdir/vim directory for plugins (rhbz#1193230)
|
||||||
|
- vi, rvi, rview, ex, view don't read vimrc anymore. They use virc instead
|
||||||
|
(rhbz#1045815)
|
||||||
|
- fix dates in changelogs when spec.vim is used and locale != 'C'
|
||||||
|
|
||||||
* Fri Apr 08 2016 Karsten Hopp <karsten@redhat.com> 7.4.1718-1
|
* Fri Apr 08 2016 Karsten Hopp <karsten@redhat.com> 7.4.1718-1
|
||||||
- patchlevel 1718
|
- patchlevel 1718
|
||||||
|
|
||||||
|
|||||||
37
virc
Normal file
37
virc
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
|
||||||
|
set fileencodings=ucs-bom,utf-8,latin1
|
||||||
|
endif
|
||||||
|
|
||||||
|
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 history=50 " keep 50 lines of command line history
|
||||||
|
set ruler " show the cursor position all the time
|
||||||
|
|
||||||
|
" Only do this part when compiled with support for autocommands
|
||||||
|
if has("autocmd")
|
||||||
|
augroup fedora
|
||||||
|
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
|
||||||
|
autocmd BufReadPost *
|
||||||
|
\ 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
|
||||||
|
autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
|
||||||
|
augroup END
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
filetype plugin on
|
||||||
|
|
||||||
|
if &term=="xterm"
|
||||||
|
set t_Co=8
|
||||||
|
set t_Sb=[4%dm
|
||||||
|
set t_Sf=[3%dm
|
||||||
|
endif
|
||||||
Loading…
Reference in New Issue
Block a user