- patchlevel 1835

.gitignore

@@ -3,3 +3,4 @@
 /vim-7.4-1797.tar.bz2
 /vim-7.4-1816.tar.bz2
 /vim-7.4-1830.tar.bz2
+/vim-7.4-1835.tar.bz2

README.patches

@@ -1,9 +1,49 @@
-commit 0a1b630aab827344cc14ea2c98bbd068f6498abb
+commit 991dea3ab185fb35e577ab0bdfd443cd4b43ccc6
-Merge: 3247fc9 73a733e
+Author: Bram Moolenaar <Bram@vim.org>
-Author: Karsten Hopp <karsten@redhat.com>
+Date:   Tue May 24 11:31:32 2016 +0200
-Date:   Fri May 13 11:29:13 2016 +0200
 
-    Merge branch 'master' of https://github.com/vim/vim
+    patch 7.4.1835
+    Problem:    When splitting and closing a window the status height changes.
+    Solution:   Compute the frame height correctly. (Hirohito Higashi)
+
+commit 908be438794619f10ef7fa25e24e5893b2ae0189
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue May 24 10:51:30 2016 +0200
+
+    patch 7.4.1834
+    Problem:    Possible crash when conceal is active.
+    Solution:   Check for the screen to be valid when redrawing a line.
+
+commit 2ff8b64679242e73248774a388d54931c9ce49bd
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue May 24 10:46:45 2016 +0200
+
+    patch 7.4.1833
+    Problem:    Cannot use an Ex command for 'keywordprg'.
+    Solution:   Accept an Ex command. (Nelo-Thara Wallus)
+
+commit 06d2d38ab7564e1f784b1058a4ef4580cd6d1810
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri May 20 17:24:11 2016 +0200
+
+    Updated runtime files.
+
+commit dc303bce10c60a3314078ea168064552fadf01af
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue May 17 17:45:38 2016 +0200
+
+    patch 7.4.1832
+    Problem:    Memory leak in debug commands.
+    Solution:   Free memory before overwriting the pointer. (hint by Justin Keyes)
+
+commit e40d75f6ef73095286b66e546c70ff6f045e009d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun May 15 18:00:19 2016 +0200
+
+    patch 7.4.1831
+    Problem:    When timer_stop() is called with a string there is no proper error
+                message.
+    Solution:   Require getting a number. (Bjorn Linse)
 
 commit 73a733e08bb7853d2ac12c60756ae51e39abb4d9
 Author: Bram Moolenaar <Bram@vim.org>
@@ -289,13 +329,6 @@ Date:   Fri Apr 29 22:33:27 2016 +0200
     Problem:    Still compiler warning for unused return value. (Charles Campbell)
     Solution:   Assign to ignoredp.
 
-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
@@ -389,13 +422,6 @@ Date:   Tue Apr 26 17:16:24 2016 +0200
     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
@@ -489,13 +515,6 @@ Date:   Fri Apr 22 20:20:19 2016 +0200
     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
@@ -1007,13 +1026,6 @@ Date:   Fri Apr 8 17:07:19 2016 +0200
                 by them.  Go through all jobs and channels to find unreferenced
                 items.  Also, decrement reference counts when garbage collecting.
 
-commit 8cf439cb8003c79addd36cc2c6d1dcc42652f3f2
-Merge: d8dc5e6 d56374e
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Fri Apr 8 11:00:52 2016 +0200
-
-    Merge branch 'master' of https://github.com/vim/vim
-
 commit d56374e25df0b317b01423a01f158157faa647fa
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Thu Apr 7 22:16:30 2016 +0200
@@ -2275,13 +2287,6 @@ Date:   Tue Mar 15 16:35:39 2016 +0100
     Problem:    No test for ":help".
     Solution:   Add a test for what 7.4.1568 fixed. (Higashi Higashi)
 
-commit d8dc5e63fabbbddeb45a311f1deff240e4a8e709
-Merge: 0ee7bfe 426dd02
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Tue Mar 15 16:13:43 2016 +0100
-
-    Merge branch 'master' of https://github.com/vim/vim
-
 commit 426dd0219512af5f4abeb0901b533159253ffba3
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Mar 15 15:09:29 2016 +0100
@@ -3587,14 +3592,6 @@ Date:   Thu Feb 25 15:25:03 2016 +0100
                 (Jörg Plate)
     Solution:   Use "char_u" always.
 
-commit 0ee7bfeec9fef5bd2a86ba0e37de6b4ffe11e152
-Merge: 61d7db7 f391327
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Thu Feb 25 00:31:00 2016 +0100
-
-    Merg e branch 'master' of https://github.com/vim/vim
-    pd
-
 commit f391327adbbffb11180cf6038a92af1ed144e907
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Thu Feb 25 00:00:01 2016 +0100
@@ -4203,13 +4200,6 @@ Date:   Wed Feb 17 20:48:19 2016 +0100
     Problem:    A few more compiler warnings. (Axel Bender)
     Solution:   Add type casts.
 
-commit 61d7db7b5a9897fea34054cebe8442f45efa3fa4
-Merge: 07a61e8 2032190
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Wed Feb 17 14:50:39 2016 +0100
-
-    Merge branch 'master' of https://github.com/vim/vim
-
 commit 203219048fa007b5042d9b893fd647aef44722a0
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Wed Feb 17 12:30:17 2016 +0100
@@ -5204,13 +5194,6 @@ Date:   Mon Feb 1 21:32:58 2016 +0100
     Solution:   Add a zero timeout.  Call parse_queued_messages(). (Yasuhiro
                 Matsumoto)
 
-commit 07a61e8ce9dfd44a17d63b4629fb7443cc481a7f
-Merge: 67a4e64 fb1f626
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Mon Feb 1 14:12:20 2016 +0100
-
-    Merge branch 'master' of https://github.com/vim/vim
-
 commit fb1f62691eae7c79a28b3b17a60e72ce198c71a2
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Jan 31 20:24:32 2016 +0100
@@ -5962,13 +5945,6 @@ Date:   Tue Jan 19 23:36:15 2016 +0100
     Solution:   Add the "f" flag to ":sort".  (Alex Jakushev)  Also add the "f"
                 flag to sort().
 
-commit 67a4e64892d55b6ee45673230ca77693860ac6cb
-Merge: 2b52732 b8060fe
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Tue Jan 19 22:53:42 2016 +0100
-
-    Merge branch 'master' of https://github.com/vim/vim
-
 commit b8060fe862f684b591f9ac679eac5b2594d6c5a0
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Jan 19 22:29:28 2016 +0100
@@ -6457,12 +6433,6 @@ Date:   Tue Jan 12 21:00:40 2016 +0100
                 problem.
     Solution:   Move the conditions.  Don't use endpos if handling an error.
 
-commit 2b527328d1927b42ca190ff5f92ba69283bdcad0
-Author: Karsten Hopp <karsten@redhat.com>
-Date:   Tue Jan 12 14:59:32 2016 +0100
-
-    add more ssh keywords
-
 commit d79e55016cf8268cee935f1ac3b5b28712d1399e
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Jan 10 22:13:02 2016 +0100

sources

@@ -1 +1 @@
-f2a5fe68d5ceb5471627e21cc45522b7  vim-7.4-1830.tar.bz2
+ba3ca37577a368dd57decf4335914d33  vim-7.4-1835.tar.bz2

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 1830
+%define patchlevel 1835
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -745,6 +745,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue May 24 2016 Karsten Hopp <karsten@redhat.com> 7.4.1835-1
+- patchlevel 1835
+
 * Tue May 24 2016 Karsten Hopp <karsten@redhat.com> - 7.4.1830-3
 - mv vim.sh and vim.csh to source files
 - sh profile.d improvements: don't leak $ID, don't fail on nounset