diff --git a/.gitignore b/.gitignore
index 272f0bf..8479958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,4 @@
 /vim-7.4.tar.bz2
-/vim-7.4-1786.tar.bz2
-/vim-7.4-1797.tar.bz2
-/vim-7.4-1816.tar.bz2
-/vim-7.4-1830.tar.bz2
-/vim-7.4-1835.tar.bz2
-/vim-7.4-1842.tar.bz2
-/vim-7.4-1868.tar.bz2
-/vim-7.4-1988.tar.bz2
-/vim-7.4-1989.tar.bz2
-/vim-7.4-2330.tar.bz2
 /vim-7.4-2342.tar.bz2
+/vim-8.0-003.tar.bz2
+/vim-8.0-018.tar.bz2
diff --git a/README.patches b/README.patches
index 639feb1..5d73e35 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,473 @@
+commit a24b70db343ff0872a314d076c8a9cf437530495
+Merge: 550c699 ec68a99
+Author: Karsten Hopp <karsten@redhat.com>
+Date:   Thu Oct 6 18:37:07 2016 +0200
+
+    Merge branch 'master' of https://github.com/vim/vim
+
+commit ec68a99464055029c01082762517e97245ddae0c
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Oct 3 21:37:41 2016 +0200
+
+    patch 8.0.0022
+    Problem:    If a channel in NL mode is missing the NL at the end the remaining
+                characters are dropped.
+    Solution:   When the channel is closed use the remaining text. (Ozaki Kiichi)
+
+commit 84dbd494dca599ecff05b2c2279d402c12e6d197
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Oct 2 23:09:31 2016 +0200
+
+    patch 8.0.0021
+    Problem:    In the GUI when redrawing the cursor it may be on the second half
+                of a double byte character.
+    Solution:   Correct the cursor column. (Yasuhiro Matsumoto)
+
+commit 6100d02aab7c8294b581cb299250eea164b50e9d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Oct 2 16:51:57 2016 +0200
+
+    patch 8.0.0020
+    Problem:    The regexp engines are not reentrant.
+    Solution:   Add regexec_T and save/restore the state when needed.
+
+commit 2ec618c9feac4573b154510236ad8121c77d0eca
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Oct 1 14:47:05 2016 +0200
+
+    Updated runtime files.
+
+commit b3435b0a3a0967115658d0a8c0224a28969cfa02
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 29 20:54:59 2016 +0200
+
+    patch 8.0.0019
+    Problem:    Test_command_count is old style.
+    Solution:   Turn it into a new style test. (Naruhiko Nishino)
+                Use more assert functions.
+
+commit b9c31e71f5a4653a27e81c21226039bfa35b9131
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 29 15:18:57 2016 +0200
+
+    patch 8.0.0018
+    Problem:    When using ":sleep" channel input is not handled.
+    Solution:   When there is a channel check for input also when not in raw mode.
+                Check every 100 msec.
+
+commit 177778575148e265c0e32ec2abf2d2c615f5ead5
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 27 21:30:22 2016 +0200
+
+    Missing part of patch 8.0.0014
+
+commit 890680ca6364386fabb271c85e0755bcaa6a33c1
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 27 21:28:56 2016 +0200
+
+    patch 8.0.0017
+    Problem:    Cannot get the number of the current quickfix or location list.
+    Solution:   Use the current list if "nr" in "what" is zero. (Yegappan
+                Lakshmanan)  Remove debug command from test.
+
+commit 0e77b7691ee7c477facb4c9d9162c8603ada2d84
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 26 22:58:58 2016 +0200
+
+    patch 8.0.0016
+    Problem:    Build fails.
+    Solution:   Include missing change.
+
+commit 7ef3810d28b7ab2edbfcafab3fe8ad8bc2c2f138
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 26 22:36:58 2016 +0200
+
+    patch 8.0.0015
+    Problem:    Can't tell which part of a channel has "buffered" status.
+    Solution:   Add an optional argument to ch_status().  Let ch_info() also
+                return "buffered" for out_status and err_status.
+
+commit 1eceadaf481e34ed8155011534159775697ce884
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 26 20:14:56 2016 +0200
+
+    patch 8.0.0014
+    Problem:    Crypt tests are old style.
+    Solution:   Convert to new style.
+
+commit c79d6aa01d86cd98cffddc80825c1c600e833bbf
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 22:27:37 2016 +0200
+
+    patch 8.0.0013
+    Problem:    Missing comma in list.
+    Solution:   Add the comma.
+
+commit 3e496b0ea31996b665824f45664dee1fdd73c4d0
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 22:11:48 2016 +0200
+
+    Updated runtime files.
+
+commit 9af418427652562384744648d7d173a4bfebba95
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 21:45:05 2016 +0200
+
+    patch 8.0.0012
+    Problem:    Typos in comments.
+    Solution:   Change "its" to "it's". (Matthew Brener, closes #1088)
+
+commit 20eeb6129d12a5d073ee949043de73242a36976c
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 21:06:50 2016 +0200
+
+    Fix patch applied twice.
+
+commit 947000d6e481042d3869bd65b149d72511c31ab2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 21:03:02 2016 +0200
+
+    patch 8.0.0011
+    Problem:    On OSX Test_pipe_through_sort_all() sometimes fails.
+    Solution:   Add the test to the list of flaky tests.
+
+commit 680e015bfe19be6772d3bd754486fbd45c1a9d3b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 20:54:11 2016 +0200
+
+    patch 8.0.0010
+    Problem:    Crash when editing file that starts with crypt yeader. (igor2x)
+    Solution:   Check for length of text. (Christian Brabandt) Add a test.
+
+commit 3f1c15b24a3939d193c80c509132db9ee4d8cceb
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 25 20:22:02 2016 +0200
+
+    patch 8.0.0009
+    Problem:    Unecessary workround for AppVeyor.
+    Solution:   Revert patch 7.4.990. (Christian Brabandt)
+
+commit 50ba526fbf3e9e5e0e6b0b3086a4d5df581ebc7e
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 22 22:33:02 2016 +0200
+
+    Updated runtime files.
+
+commit 9e02cfa226b2577ec867b544a1a450a428a19880
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 22 21:27:11 2016 +0200
+
+    patch 8.0.0008
+    Problem:    Popup complete test is disabled.
+    Solution:   Enable the test and change the assert. (Hirohito Higashi)
+
+commit bbe917d9d465a66a29e38879c7f66df51b0b0dc3
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 21 22:41:24 2016 +0200
+
+    patch 8.0.0007
+    Problem:    Vim 7.4 is still mentioned in a few places.
+    Solution:   Update to Vim 8.  (Uncle Bill, closes #1094)
+
+commit ebdd90ac282909c0bfcd6e83e70505abbbd5a38d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 20 21:39:14 2016 +0200
+
+    patch 8.0.0006
+    Problem:    ":lb" is interpreted as ":lbottom" while the documentation says it
+                means ":lbuffer".
+    Solution:   Adjust the order of the commands. (haya14busa, closes #1093)
+
+commit d07969093a9b3051511c478d71c36de6fc33c0d6
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 16 20:02:31 2016 +0200
+
+    Updated runtime files.
+
+commit 3c4ebeba17399e4ef33d004c269e667f696f0eb6
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 15 11:44:27 2016 +0200
+
+    patch 8.0.0005
+    Problem:    Netbeans test fails with Python 3. (Jonathonf)
+    Solution:   Encode the string before sending it. (closes #1070)
+
+commit 5582ef14384525e8cec86016876d97a6b32dd548
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 14 22:16:13 2016 +0200
+
+    patch 8.0.0004
+    Problem:    A string argument for function() that is not a function name
+                results in an error message with NULL. (Christian Brabandt)
+    Solution:   Use the argument for the error message.
+
+commit 789a5c0e3d27f09456678f0cfb6c1bd2d8ab4a35
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 19:51:11 2016 +0200
+
+    patch 8.0.0003
+    Problem:    getwinvar() returns wrong Value of boolean and number options,
+                especially non big endian systems. (James McCoy)
+    Solution:   Cast the pointer to long or int. (closes #1060)
+
+commit b56e7ff0dbbfa85361bdbc5b4a86ff8b57a7acbb
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 16:41:04 2016 +0200
+
+    Update translations for intro page.
+
+commit 9e1e7afc1f29b67fe3721442b49af3b20644a3ee
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 16:31:10 2016 +0200
+
+    patch 8.0.0002
+    Problem:    The netrw plugin does not work.
+    Solution:   Make it accept version 8.0.
+
+commit 6401024869dcd722ee1b98b4ba58e6caa215201b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 16:23:34 2016 +0200
+
+    patch 8.0.0001
+    Problem:    Intro screen still mentions version7. (Paul)
+    Solution:   Change it to version8.
+
+commit bb76f24af2010943387ce696a7092175b4ecccf2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 14:24:39 2016 +0200
+
+    Vim 8.0 release
+
+commit edeb846c1f04a49466992077eaea3396838bf4fd
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 13:32:02 2016 +0200
+
+    patch 7.4.2367
+    Problem:    Test runner misses a comma.
+    Solution:   Add the comma.
+
+commit 100f27721b2f901eae348ef3635897e8be5d0307
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 13:18:29 2016 +0200
+
+    patch 7.4.2366
+    Problem:    MS-Windows gvim.exe does not have DirectX support.
+    Solution:   Add the DIRECTX to the script.
+
+commit 1b010058235fb803c1d4f42a02d2883921be8ef4
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 12:24:11 2016 +0200
+
+    patch 7.4.2365
+    Problem:    Needless line break. Confusing directory name.
+    Solution:   Remove line break.  Prepend "../" to "tools".
+
+commit 220adb1e9f9e0b27d28185167d2730bf2f93057d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 12 12:17:26 2016 +0200
+
+    A few more runtime updates.
+
+commit e1c8c7a6742be6072290f9aa54ae358060d9c42f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 11 16:48:50 2016 +0200
+
+    patch 7.4.2364
+    Problem:    Sort test sometimes fails.
+    Solution:   Add it to the list of flaky tests.
+
+commit cbeab96f87b91ed4b096216c397552b7f6d270f9
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 11 15:08:56 2016 +0200
+
+    patch 7.4.2363
+    Problem:    Superfluous function prototypes.
+    Solution:   Remove them.
+
+commit 7e1479b86c590a66b63a274c079b7f18907d45a4
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 11 15:07:27 2016 +0200
+
+    Updated runtime files, Japanese translations.
+
+commit 4930a76a0357f76a829eafe4985d04cf3ce0e9e0
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Sep 11 14:39:53 2016 +0200
+
+    patch 7.4.2362
+    Problem:    Illegal memory access with ":1@". (Dominique Pelle)
+    Solution:   Correct cursor column after setting the line number.  Also avoid
+                calling end_visual_mode() when not in Visual mode.
+
+commit ee39ef0b93d31763d05e54ba99801e3f1a254c0d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Sep 10 19:17:42 2016 +0200
+
+    patch 7.4.2361
+    Problem:    Checking for last_timer_id to overflow is not reliable. (Ozaki
+                Kiichi)
+    Solution:   Check for the number not going up.
+
+commit 80c3fd7c559c7d329d57afe10db9bfb0adf10e46
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Sep 10 15:52:55 2016 +0200
+
+    patch 7.4.2360
+    Problem:    Invalid memory access when formatting. (Dominique Pelle)
+    Solution:   Make sure cursor line and column are associated.
+
+commit 26fe0d56912e42c2b16a61b2480e19ba569aee98
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Sep 10 14:27:30 2016 +0200
+
+    patch 7.4.2359
+    Problem:    Memory leak in timer_start().
+    Solution:   Check the right field to be NULL.
+
+commit d47d83745ff450232328ca7a4b8b00b31bad22fc
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 22:13:24 2016 +0200
+
+    patch 7.4.2358
+    Problem:    Compiler warnings with Solaris Studio when using GTK3.
+    Solution:   Define FUNC2GENERIC depending on the system. (Kazunobu Kuriyama)
+
+commit 46643713dc6bb04b4e84986b1763ef309e960161
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 21:42:36 2016 +0200
+
+    patch 7.4.2357
+    Problem:    Attempt to read history entry while not initialized.
+    Solution:   Skip when the index is negative.
+
+commit ea683da58cf9ecf3afab9d650d3d2da76e5298d3
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 21:41:34 2016 +0200
+
+    patch 7.4.2356
+    Problem:    Reading past end of line when using previous substitute pattern.
+                (Dominique Pelle)
+    Solution:   Don't set "pat" only set "searchstr".
+
+commit 16b3578f355282846f2600ce77fb344950f0b9ce
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 20:29:50 2016 +0200
+
+    patch 7.4.2355
+    Problem:    Regexp fails to match when using "\>\)\?". (Ramel)
+    Solution:   When a state is already in the list, but addstate_here() is used
+                and the existing state comes later, add the new state anyway.
+
+commit d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 17:59:50 2016 +0200
+
+    patch 7.4.2354
+    Problem:    The example that explains nested backreferences does not work
+                properly with the new regexp engine. (Harm te Hennepe)
+    Solution:   Also save the end position when adding a state. (closes #990)
+
+commit 2931f2a5df0d962032d41060af84d9fd2cb35c9f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 16:59:08 2016 +0200
+
+    patch 7.4.2353
+    Problem:    Not enough test coverage for Normal mode commands.
+    Solution:   Add more tests. (Christian Brabandt)
+
+commit 922a443cfdb1a37ef8bdeadf84f8b821ec4b37bd
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 16:03:48 2016 +0200
+
+    patch 7.4.2352
+    Problem:    Netbeans test fails in shadow directory.
+    Solution:   Also copy README.txt to the shadow directory.
+
+commit ff330ff2c4500dc5535631418d601194654e4536
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 15:31:34 2016 +0200
+
+    patch 7.4.2351
+    Problem:    Netbeans test fails when run from unpacked MS-Windows sources.
+    Solution:   Open README.txt instead of Makefile.
+
+commit cf703fe9d66744ffd7d9c625ee1cbe048ee07740
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 14:59:39 2016 +0200
+
+    patch 7.4.2350
+    Problem:    Test 86 and 87 fail with some version of Python.
+    Solution:   Unify "can't" and "cannot".  Unify quotes.
+
+commit 2321ca2a78286bc026fa7f407281ddbeb04114bb
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 14:17:18 2016 +0200
+
+    patch 7.4.2349
+    Problem:    Valgrind reports using uninitialzed memory. (Dominique Pelle)
+    Solution:   Check the length before checking for a NUL.
+
+commit 9a27c7fde6d453d9892b6f6baa756bce4d6d419d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Sep 9 12:57:09 2016 +0200
+
+    patch 7.4.2348
+    Problem:    Crash on exit when EXITFREE is defined. (Dominique Pelle)
+    Solution:   Don't access curwin when exiting.
+
+commit c4a908e83690844b0d3a46124ba6af7d23485d69
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 8 23:35:30 2016 +0200
+
+    patch 7.4.2347
+    Problem:    Crash when closing a buffer while Visual mode is active.
+                (Dominique Pelle)
+    Solution:   Adjust the position before computing the number of lines.
+                When closing the current buffer stop Visual mode.
+
+commit abd468ed0fbcba391e7833feeaa7de3ced841455
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 8 22:22:43 2016 +0200
+
+    Updated runtime files
+
+commit f18c4dbbe545757ce93563b25380e6f010340b4e
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 8 22:10:06 2016 +0200
+
+    patch 7.4.2346
+    Problem:    Autocommand test fails when run directly, passes when run as part
+                of test_alot.
+    Solution:   Add command to make the cursor move.  Close a tab page.
+
+commit 0eaadec6b275a8add49242e1940855fcd154ba64
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 8 20:28:45 2016 +0200
+
+    patch 7.4.2345
+    Problem:    For MinGW RUBY_API_VER_LONG isn't set correctly.  Many default
+                version numbers are outdated.
+    Solution:   Set RUBY_API_VER_LONG to RUBY_VER_LONG. Use latest stable releases
+                for defaults. (Ken Takata)
+
+commit 169ebb080454357279ad5ad21ac532deaec605e8
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 7 23:32:23 2016 +0200
+
+    patch 7.4.2344
+    Problem:    The "Reading from channel output..." message can be unwanted.
+                Appending to a buffer leaves an empty first line behind.
+    Solution:   Add the "out_msg" and "err_msg" options. Writing the first line
+                overwrites the first, empty line.
+
+commit 53f1673cd909eb1c809c6a9086e3d104a0df9bed
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 7 20:46:39 2016 +0200
+
+    patch 7.4.2343
+    Problem:    Too many old file tests.
+    Solution:   Turn several into new style tests. (Yegappan Lakshmanan)
+
 commit 1b0c1d050e28f351650c0c84e234fd24f12e5e29
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Sep 6 23:23:52 2016 +0200
@@ -3096,6 +3566,13 @@ Date:   Tue Jul 5 22:28:40 2016 +0200
     Problem:    Cscope items are not sorted.
     Solution:   Put the new "a" command first. (Ken Takata)
 
+commit 550c699eb780b27b3875f6cdffa2eae471390908
+Merge: 26522e4 b33c7eb
+Author: Karsten Hopp <karsten@redhat.com>
+Date:   Tue Jul 5 12:56:13 2016 +0200
+
+    Merge branch 'master' of https://github.com/vim/vim
+
 commit b33c7eb5b813cb631b2b0ca5c4029e1788a09bde
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Jul 4 22:29:49 2016 +0200
@@ -3105,6 +3582,13 @@ Date:   Mon Jul 4 22:29:49 2016 +0200
     Solution:   Implement using a Funcref argument (Yasuhiro Matsumoto, Ken
                 Takata)
 
+commit 26522e4eebc3a78a23eeb63fa5ee2d24a9a7f189
+Merge: 1c582ef ab9c89b
+Author: Karsten Hopp <karsten@redhat.com>
+Date:   Mon Jul 4 10:17:45 2016 +0200
+
+    Merge branch 'master' of https://github.com/vim/vim
+
 commit ab9c89b68dcbdb3fbda8c5a50dd90caca64f1bfd
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Jul 3 17:47:26 2016 +0200
@@ -4151,6 +4635,13 @@ Date:   Thu Jun 2 11:54:06 2016 +0200
     Problem:    Can't build with old version of Perl.
     Solution:   Define PERLIO_FUNCS_DECL. (Tom G. Christensen)
 
+commit 1c582ef49f17436313b82977c0a941f461ba130a
+Merge: 0a1b630 b89a25f
+Author: Karsten Hopp <karsten@redhat.com>
+Date:   Thu Jun 2 10:51:31 2016 +0200
+
+    Merge branch 'master' of https://github.com/vim/vim
+
 commit b89a25f17e274dc308c584ea69a129ffbb26bc3d
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Wed Jun 1 23:08:39 2016 +0200
@@ -4488,6 +4979,13 @@ Date:   Sun May 15 18:00:19 2016 +0200
                 message.
     Solution:   Require getting a number. (Bjorn Linse)
 
+commit 0a1b630aab827344cc14ea2c98bbd068f6498abb
+Merge: 3247fc9 73a733e
+Author: Karsten Hopp <karsten@redhat.com>
+Date:   Fri May 13 11:29:13 2016 +0200
+
+    Merge branch 'master' of https://github.com/vim/vim
+
 commit 73a733e08bb7853d2ac12c60756ae51e39abb4d9
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Wed May 11 21:05:05 2016 +0200
@@ -4772,6 +5270,13 @@ 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
@@ -4865,6 +5370,13 @@ 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
@@ -4958,6 +5470,13 @@ 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
@@ -5469,6 +5988,13 @@ 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
@@ -6730,6 +7256,13 @@ 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
@@ -8035,6 +8568,14 @@ 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
@@ -8643,6 +9184,13 @@ 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
@@ -9637,6 +10185,13 @@ 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
@@ -10388,6 +10943,13 @@ 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
@@ -10876,6 +11438,12 @@ 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
diff --git a/sources b/sources
index 317a7a8..1fefe47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1bca7d7eabcd7e2d638ae2f2e23df20  vim-7.4-2342.tar.bz2
+d09d758d0e76356a3f881a87dd86f007  vim-8.0-018.tar.bz2
diff --git a/vim.spec b/vim.spec
index e34daaf..a31d0bd 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 2342
+%define patchlevel 018
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -14,8 +14,8 @@
 %define withruby 1
 %define withlua 1
 
-%define baseversion 7.4
-%define vimdir vim74
+%define baseversion 8.0
+%define vimdir vim80
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -742,8 +742,15 @@ rm -rf %{buildroot}
 %{_bindir}/evim
 %{_mandir}/man1/evim.*
 %{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Oct 06 2016 Karsten Hopp <karsten@redhat.com> 8.0.018-1
+- patchlevel 018
+
+* Tue Sep 13 2016 Karsten Hopp <karsten@redhat.com> 8.0.003-1
+- patchlevel 003
+
 * Wed Sep 07 2016 Karsten Hopp <karsten@redhat.com> 7.4.2342-1
 - patchlevel 2342