diff --git a/.gitignore b/.gitignore
index 531c429..d839578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ vim-7.2.tar.bz2
/vim-7.4-1087.tar.bz2
/vim-7.4-1142.tar.bz2
/vim-7.4-1229.tar.bz2
+/vim-7.4-1344.tar.bz2
diff --git a/README.patches b/README.patches
index e5d7c87..4e988fa 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,1004 @@
+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
+
+ patch 7.4.1344
+ Problem: Can't compile Win32 GUI with tiny features.
+ Solution: Add #ifdef. (Christian Brabandt)
+
+commit cd39bbcd1dd5bdc280f0fa5833b1107853f1227f
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 17 10:05:42 2016 +0100
+
+ patch 7.4.1343
+ Problem: Can't compile with +job but without +channel. (Andrei Olsen)
+ Solution: Move get_job_options up and adjust #ifdef.
+
+commit e74e8e7d758e9312165a931f176185f07a64231a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 22:01:30 2016 +0100
+
+ patch 7.4.1342
+ Problem: On Mac OS/X the waittime must be > 0 for connect to work.
+ Solution: Use select() in a different way. (partly by Kazunobu Kuriyama)
+ Always use a waittime of 1 or more.
+
+commit 910b8aac5dc4693c4508b7acd2cef0bbfac04242
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 21:03:07 2016 +0100
+
+ patch 7.4.1341
+ Problem: It's difficult to add more arguments to ch_sendraw() and
+ ch_sendexpr().
+ Solution: Make the third option a dictionary.
+
+commit 7d63f624603ebeae336d4c504f82ab3da3481f46
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 20:31:31 2016 +0100
+
+ patch 7.4.1340
+ Problem: Merge left extra #endif behind.
+ Solution: Remove the #endif
+
+commit 418f81b5fa400ed59793384f2f3d9df45390f080
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 20:12:02 2016 +0100
+
+ patch 7.4.1339
+ Problem: Warnings when building the GUI with MingW. (Cesar Romani)
+ Solution: Add type cats. (Yasuhiro Matsumoto)
+
+commit 0c2c96e47c8b44f7d69da2add906224a89318ff7
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 19:44:20 2016 +0100
+
+ patch 7.4.1338
+ Problem: Another part of the change is missing.
+ Solution: Type os_unix.c right this time.
+
+commit ba093bc0002ac60aebd0f2d8a458e2fdac38f1ed
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 19:37:29 2016 +0100
+
+ patch 7.4.1337
+ Problem: Part of the change is missing.
+ Solution: Add changes to eval.c
+
+commit 9a6e33a19b18f20c25b73392cd2faa3ec4890c8c
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 19:25:12 2016 +0100
+
+ patch 7.4.1336
+ Problem: Channel NL mode is not supported yet.
+ Solution: Add NL mode support to channels.
+
+commit 5d54a045989599468b7a971fc354b0cba4e2b09d
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 16:39:51 2016 +0100
+
+ patch 7.4.1335
+ Problem: Can't build on MS-Windows with +job but without +channel. (Cesar
+ Romani)
+ Solution: Add #ifdefs. (Yasuhiro Matsumoto)
+
+commit 6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 15:06:59 2016 +0100
+
+ patch 7.4.1334
+ Problem: Many compiler warnings with MingW.
+ Solution: Add type casts. (Yasuhiro Matsumoto)
+
+commit f8df7addc5f741c16fa2a458f8777ac1fdf2e01e
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 14:07:40 2016 +0100
+
+ patch 7.4.1333
+ Problem: Channel test fails on non-darwin builds.
+ Solution: Add the "osx" feature and test for that. (Kazunobu Kuriyama)
+
+commit acd58ef676bb9559ac0f635f66b62f4602929c87
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 13:42:24 2016 +0100
+
+ patch 7.4.1332
+ Problem: Problem using Python3 when compiled with MingW.
+ Solution: Define PYTHON3_HOME as a wide character string. (Yasuhiro
+ Matsumoto)
+
+commit d46ae142aa9452e99576b5e923de974704e3c896
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 13:33:52 2016 +0100
+
+ patch 7.4.1331
+ Problem: Crash when closing the channel in a callback. (Christian J.
+ Robinson)
+ Solution: Take the callback out of the list before invoking it.
+
+commit 0943a09db84b036ec550d7f2e5b832f621b400ca
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 13:11:17 2016 +0100
+
+ patch 7.4.1330
+ Problem: fd_read() has an unused argument.
+ Solution: Remove the timeout. (Yasuhiro Matsumoto)
+
+commit 5cefd4098204b4677387511b586673649f2fab48
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 16 12:44:26 2016 +0100
+
+ patch 7.4.1329
+ Problem: Crash when using channel that failed to open.
+ Solution: Check for NULL. Update messages. (Yukihiro Nakadaira)
+
+commit 12dcf024e90ab511f04a08b20fe7eedbe92096d2
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 23:09:04 2016 +0100
+
+ patch 7.4.1328
+ Problem: Can't compile with +job but without +channel. (John Marriott)
+ Solution: Add more #ifdefs.
+
+commit b6a7737938e7e7b34f862f58aa5498e6f652e33d
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 22:55:28 2016 +0100
+
+ patch 7.4.1327
+ Problem: Channel test doesn't work if Python executable is python.exe.
+ Solution: Find py.exe or python.exe. (Ken Takata)
+
+commit 97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 22:45:12 2016 +0100
+
+ patch 7.4.1326
+ Problem: Build rules are bit too complicated.
+ Solution: Remove -lwsock32 from Netbeans, it's already added for the channel
+ feature that it depends on. (Tony Mechelynck)
+
+commit 2368917d8f0c0a997eac7a51ddfaa748dc528392
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 22:37:37 2016 +0100
+
+ patch 7.4.1325
+ Problem: Channel test fails on difference between Unix and DOS line endings.
+ Solution: Strip off CR. Make assert show difference better.
+
+commit 38a55639d603823efcf2d2fdf542dbffdeb60b75
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 22:07:32 2016 +0100
+
+ Update runtime files.
+
+commit d807036d10615b960c814ef3890ecad335b57f56
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 21:56:54 2016 +0100
+
+ patch 7.4.1324
+ Problem: Channels with pipes don't work on MS-Windows.
+ Solution: Add pipe I/O support. (Yasuhiro Matsumoto)
+
+commit a971df849f92e32e18ce475fdb47ad9ea2aa47f3
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 21:22:10 2016 +0100
+
+ patch 7.4.1323
+ Problem: Do not get warnings when building with MingW.
+ Solution: Remove the -w flag. (Ken Takata)
+
+commit 3bece9fee9c02934d3e295b29d253e13d4ef26a7
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 20:39:46 2016 +0100
+
+ patch 7.4.1322
+ Problem: Crash when unletting the variable that holds the channel in a
+ callback function. (Christian Robinson)
+ Solution: Increase the reference count while invoking the callback.
+
+commit 71b0f7b5c083d32fd37fa825f5d829b6a6c1a09a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 15 12:44:20 2016 +0100
+
+ patch 7.4.1321
+ Problem: Compiler complains about missing statement.
+ Solution: Add an empty statement. (Andrei Olsen)
+
+commit 44d571868f4fcf000e8b03ee0a350f1f8131c9ca
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 14 23:11:23 2016 +0100
+
+ patch 7.4.1320
+ Problem: Building with Cygwin or MingW with channel but without Netbeans
+ doesn't work.
+ Solution: Set NETBEANS to "no" when not used.
+
+commit 16eb4f88000cfdba68df6c421fe44e7e029ba53e
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 14 23:02:34 2016 +0100
+
+ patch 7.4.1319
+ Problem: Tests fail on MS-Windows and on Unix with GUI.
+ Solution: Fix unregistering.
+
+commit 7b3ca76a451b10d238ef946f3231762e0bd988e9
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 14 19:13:43 2016 +0100
+
+ patch 7.4.1318
+ Problem: Channel with pipes doesn't work in GUI.
+ Solution: Register input handlers for pipes.
+
+commit 0727d362b4dad83d9fdf1caba074213e77e0aa49
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 14 00:19:59 2016 +0100
+
+ patch 7.4.1317
+ Problem: MS-Windows: channel test fails.
+ Solution: Temporarily disable Test_connect_waittime().
+
+commit fa4bce7dd23e62d5a2fd79c7719969e11d5597aa
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 23:50:08 2016 +0100
+
+ patch 7.4.1316
+ Problem: Can't build MS-Windows console version. (Tux)
+ Solution: Add #ifdefs.
+
+commit 7707344ddec9069b495b2a5ed41f2104466fc88b
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 23:23:53 2016 +0100
+
+ patch 7.4.1315
+ Problem: Using a channel handle does not allow for freeing it when unused.
+ Solution: Add the Channel variable type.
+
+commit e516c39ee97cb85fa230fbb1b1f54ad1346920d9
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 18:50:38 2016 +0100
+
+ patch 7.4.1314
+ Problem: Warning for uninitialzed variable.
+ Solution: Initialize it. (Dominique Pelle)
+
+commit bfa1ffca8bcce92c030d8366036a316954f1ee69
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 18:40:30 2016 +0100
+
+ patch 7.4.1313
+ Problem: MS-Windows: Using socket after it was closed causes an exception.
+ Solution: Don't give an error when handling WM_NETBEANS. Re-enable tests
+ for MS-Windows.
+
+commit f8b7d890f1d62f3ab101d2b02dd7716cb7f053cb
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 17:24:26 2016 +0100
+
+ patch 7.4.1312
+ Problem: sock_T is not defined without the +channel feature.
+ Solution: Always define it.
+
+commit d090d7bab5a0d96559579e078dfdcc6d7d4f4713
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 17:09:53 2016 +0100
+
+ patch 7.4.1311
+ Problem: sock_T is defined too late.
+ Solution: Move it up.
+
+commit 6463ca229cb9412581419497924c85fcbfc854ab
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 17:04:46 2016 +0100
+
+ patch 7.4.1310
+ Problem: Jobs don't open a channel.
+ Solution: Create pipes and add them to the channel. Add ch_logfile().
+ Only Unix for now.
+
+commit 00af60bbb6cc7e8ccafddb30a1964f891b800bce
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 13 14:06:14 2016 +0100
+
+ patch 7.4.1309
+ Problem: When a test fails not all relevant info is listed.
+ Solution: Add the errors to the messages.
+
+commit 45c7f054730da5c88e1e5c7de290d25c450578a0
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 12 22:35:51 2016 +0100
+
+ patch 7.4.1308
+ Problem: Typo in test.
+ Solution: Change endf to endif.
+
+commit f02c5cffd8cd567d8dfbe4d9e93ec75eb29e7910
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 12 22:25:56 2016 +0100
+
+ patch 7.4.1307
+ Problem: Some channel tests fail on MS-Windows.
+ Solution: Disable the failing tests temporarily.
+
+commit 76467dfcafcf295fd987f712730774c6f55317d3
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 12 19:30:26 2016 +0100
+
+ patch 7.4.1306
+ Problem: Job control doesn't work well on MS-Windows.
+ Solution: Various fixes. (Ken Takata, Ozaki Kiichi , Yukihiro Nakadaira,
+ Yasuhiro Matsumoto)
+
+commit 7c29f387819b5817b003d2ba73e2b5cf3cb3d0dd
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 12 19:08:15 2016 +0100
+
+ patch 7.4.1305
+ Problem: "\%1l^#.*" does not match on a line starting with "#".
+ Solution: Do not clear the start-of-line flag. (Christian Brabandt)
+
+commit 7823a3bd2eed6ff9e544d201de96710bd5344aaf
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 11 21:08:32 2016 +0100
+
+ patch 7.4.1304
+ Problem: Function names are difficult to read.
+ Solution: Rename jsonencode to json_encode, jsondecode to json_decode,
+ jsencode to js_encode and jsdecode to js_decode.
+
+commit b6a4fee37ebbb0c76f2fbda7d06cbf48a3a07e8d
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 11 20:48:34 2016 +0100
+
+ patch 7.4.1303
+ Problem: A Funcref is not accepted as a callback.
+ Solution: Make a Funcref work. (Damien)
+
+commit 6119e6156e024d9047bbfeb7cdfdae259f9e1b92
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 11 12:48:36 2016 +0100
+
+ patch 7.4.1302
+ Problem: Typo in struct field name. (Ken Takata)
+ Solution: Rename jf_pi to jv_pi.
+
+commit 39b21272d521512b6ecac6cc0f310944f21b7443
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 10 23:28:21 2016 +0100
+
+ patch 7.4.1301
+ Problem: Missing options in ch_open().
+ Solution: Add s:chopt like in the other calls. (Ozaki Kiichi)
+
+commit 2ab375e54ef4eac438d1aef8b99d9e71f2fa0c63
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 10 22:23:06 2016 +0100
+
+ patch 7.4.1300
+ Problem: Cannot test CursorMovedI because there is typeahead.
+ Solution: Add disable_char_avail_for_testing().
+
+commit f6157284de71d8881f3b89fbd79d1ecbf842929f
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 10 21:07:14 2016 +0100
+
+ patch 7.4.1299
+ Problem: When the server sends a message with ID zero the channel handler
+ is not invoked. (Christian J. Robinson)
+ Solution: Recognize zero value for the request ID. Add a test for invoking
+ the channel handler.
+
+commit d6a8d48587b2ff43c343fa365898576cc1e235ea
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 10 20:32:20 2016 +0100
+
+ patch 7.4.1298
+ Problem: When the channel test fails in an unexpected way the server keeps
+ running.
+ Solution: Use try/catch. (Ozaki Kiichi)
+
+commit a483326e3b04215b86fe9c582ac96bb9679f0812
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 9 23:33:25 2016 +0100
+
+ patch 7.4.1297
+ Problem: On Mac test_channel leaves python instances running.
+ Solution: Use a small waittime to make ch_open() work. (Ozaki Kiichi)
+
+commit f068dcafcfe0c8018e5a559c50769ca1364bd9a5
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 9 21:24:46 2016 +0100
+
+ patch 7.4.1296
+ Problem: Cursor changes column with up motion when the matchparen plugin
+ saves and restores the cursor position. (Martin Kunev)
+ Solution: Make sure curswant is updated before invoking the autocommand.
+
+commit 4d8747cdfc13843a5680dc8340fbeb6d32e7b626
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 9 20:39:26 2016 +0100
+
+ patch 7.4.1295
+ Problem: string(job) doesn't work well on MS-Windows.
+ Solution: Use the process ID. (Yasuhiro Matsumoto)
+
+commit 7280140c08799f683ef31a6c1019e283c3dc13aa
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 9 11:37:50 2016 +0100
+
+ patch 7.4.1294
+ Problem: job_stop() only kills the started process.
+ Solution: Send the signal to the process group. (Olaf Dabrunz)
+
+commit e56bf15c163a921ce9e1c09c0d5b3a03efc63324
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 8 23:23:42 2016 +0100
+
+ patch 7.4.1293
+ Problem: Sometimes a channel may hang waiting for a message that was
+ already discarded. (Ken Takata)
+ Solution: Store the ID of the message blocking on in the channel.
+
+commit 2fc83fcd1d6dfd4728a2ef70e2316f79203c7ee0
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 8 22:57:24 2016 +0100
+
+ patch 7.4.1292
+ Problem: Some compilers complain about uninitialzed variable, even though
+ all possible cases are handled. (Dominique Pelle)
+ Solution: Add a default initialization.
+
+commit b92abad0c58de36d0b0afdcd4ec05261fa1fa84c
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 8 22:37:24 2016 +0100
+
+ patch 7.4.1291
+ Problem: On MS-Windows the channel test server doesn't quit.
+ Solution: Use return instead of break. (Ken Takata)
+
+commit cbebd4879cc78e670d79b2c57dc33d7b911c962a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 23:02:56 2016 +0100
+
+ Updated runtime files.
+
+commit ee5aeae22b8029fdb5ae97bb6ed8114a81e34c22
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 22:30:47 2016 +0100
+
+ patch 7.4.1290
+ Problem: Coverity complains about uneccessary check for NULL.
+ Solution: Remove the check.
+
+commit 0fa98e7b85b52c63611b2fe8e370f0aa1c8f6dc9
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 22:21:19 2016 +0100
+
+ patch 7.4.1289
+ Problem: Channel test fails on MS-Windows, connect() takes too long.
+ Solution: Adjust the test for MS-Windows using "waittime".
+
+commit ae8eb3ca927f1b0ac2a6643da8699538cdc380f6
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 21:59:26 2016 +0100
+
+ patch 7.4.1288
+ Problem: ch_sendexpr() does not use JS encoding.
+ Solution: Use the encoding that fits the channel mode. Refuse using
+ ch_sendexpr() on a raw channel.
+
+commit 74f5e65bcc3d77ab879f56eb977f5038edccbcf8
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 21:44:49 2016 +0100
+
+ patch 7.4.1287
+ Problem: Channel test fails.
+ Solution: Use reltimefloat().
+
+commit 7a84dbe6be0ef0e1ffbb7148cfe4ab50b9ba8f41
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 21:29:00 2016 +0100
+
+ patch 7.4.1286
+ Problem: ch_open() with a timeout doesn't work correctly.
+ Solution: Change how select() is used. Don't give an error on timeout.
+ Add a test for ch_open() failing.
+
+commit cb00f039332d3188931035e9d07144546fdea78a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 21:25:56 2016 +0100
+
+ Add missing test file.
+
+commit 79c2c881bb7ae1cbdeeff91d4875b4bf2e54df06
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 21:19:28 2016 +0100
+
+ patch 7.4.1285
+ Problem: Cannot measure elapsed time.
+ Solution: Add reltimefloat().
+
+commit dc94a26a641914df5f1ba1ab47a5752e1137287e
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 20:29:00 2016 +0100
+
+ patch 7.4.1284
+ Problem: Test 49 fails.
+ Solution: Check for a different error message.
+
+commit 942d6b22686858c9e72f8b8929df5c288170179c
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 19:57:16 2016 +0100
+
+ patch 7.4.1283
+ Problem: The job feature isn't available on MS-Windows.
+ Solution: Add the job feature. Fix argument of job_stop(). (Yasuhiro
+ Matsumoto)
+
+commit 768ce2435ae956041579ef2d26e3e9d3a2444e1e
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 19:46:12 2016 +0100
+
+ patch 7.4.1282
+ Problem: Crash when evaluating the pattern of ":catch" causes an error.
+ (Dominique Pelle)
+ Solution: Block error messages at this point.
+
+commit ea8c219ca852cc8eaf603b1bf475edf95e2850cf
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 19:27:53 2016 +0100
+
+ patch 7.4.1281
+ Problem: No test for skipping over code that isn't evaluated.
+ Solution: Add a test with code that would fail when not skipped.
+
+commit eba6d8c66c3511a5e1bfe6ffa30c8bea47d129ad
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 19:25:51 2016 +0100
+
+ patch 7.4.1280
+ Problem: Missing case value.
+ Solution: Add VAR_JOB.
+
+commit 595e64e259faefb330866852e1b9f6168544572a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 19:19:53 2016 +0100
+
+ patch 7.4.1279
+ Problem: jsonencode() is not producing strict JSON.
+ Solution: Add jsencode() and jsdecode(). Make jsonencode() and jsondecode()
+ strict.
+
+commit 55fab439a6f3bba6dbe780ac034b84d5822a1a96
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 16:53:13 2016 +0100
+
+ patch 7.4.1278
+ Problem: When jsonencode() fails it still returns something.
+ Solution: Return an empty string on failure.
+
+commit a6f72ba7c6cadd37be38d92008d10a3025fdc5ec
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 15:57:00 2016 +0100
+
+ patch 7.4.1277
+ Problem: Compiler can complain about missing enum value in switch with some
+ combination of features.
+ Solution: Remove #ifdefs around case statements.
+
+commit fbc4b4db3a9690906a96e16724350a6241cf32a5
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 15:14:01 2016 +0100
+
+ patch 7.4.1276
+ Problem: Warning for not using return value of fcntl().
+ Solution: Explicitly ignore the return value.
+
+commit cb4b01230be26ada92a1622c2278277d59ef2ec1
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 14:53:21 2016 +0100
+
+ patch 7.4.1275
+ Problem: Build fails on MS-Windows.
+ Solution: Fix wrong #ifdef.
+
+commit 835dc636a5350f610b62f110227d2363b5b2880a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 14:27:38 2016 +0100
+
+ patch 7.4.1274
+ Problem: Cannot run a job.
+ Solution: Add job_start(), job_status() and job_stop(). Currently only works
+ for Unix.
+
+commit c5f98ee987ae0c369867cf6cc581c766d3c0226d
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sun Feb 7 00:00:35 2016 +0100
+
+ patch 7.4.1273
+ Problem: assert_false(v:false) still fails.
+ Solution: Fix the typo.
+
+commit 1701481c53f4e6756038c9c00d51d491a8f42c65
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 20:32:25 2016 +0100
+
+ patch 7.4.1272
+ Problem: Using future enum value.
+ Solution: Remove it.
+
+commit 3712792637516aea7acf76a11533be1066952820
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 20:29:28 2016 +0100
+
+ patch 7.4.1271
+ Problem: assert_false(v:false) reports an error. (Nikolai Pavlov)
+ Solution: Recognize v:true and v:false. (Closes #625)
+
+commit 81e7a9c3fb37cad46c8f04a5ce871fb06819a371
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 19:57:20 2016 +0100
+
+ patch 7.4.1270
+ Problem: Warnings for missing values in switch.
+ Solution: Change switch to if-else or add values.
+
+commit 4f8b8faec31a934920a723053e8dcf47b6fac08c
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 18:42:07 2016 +0100
+
+ patch 7.4.1269
+ Problem: Encoding {'key':} to JSON doesn't give an error (Tyru)
+ Solution: Give an error.
+
+commit 26dfc41335ef47fe765643148ae980be388084ec
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 18:18:54 2016 +0100
+
+ patch 7.4.1268
+ Problem: Waittime is used as seconds instead of milliseconds. (Hirohito
+ Higashi)
+ Solution: Divide by 1000.
+
+commit a03f23351588f04276469cd7742b7ec655bb604b
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 18:09:59 2016 +0100
+
+ patch 7.4.1267
+ Problem: Easy to miss handling all types of variables.
+ Solution: Change the variable type into an enum.
+
+commit ab9fc7e0cf22bcee119b62d3433cac60f405e645
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Sat Feb 6 15:29:40 2016 +0100
+
+ patch 7.4.1266
+ Problem: A BufAdd autocommand may cause an ml_get error (Christian
+ Brabandt)
+ Solution: Increment RedrawingDisabled earlier.
+
+commit f416086f264c1d998863b2e600f4c14f799d0d99
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 5 23:09:12 2016 +0100
+
+ patch 7.4.1265
+ Problem: Not all channel commands are tested.
+ Solution: Add a test for "normal", "expr" and "redraw".
+
+commit 6076fe1986255d32b7a078a28bf9e7bea19d6f30
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 5 22:49:56 2016 +0100
+
+ patch 7.4.1264
+ Problem: Crash when receiving an empty array.
+ Solution: Check for array with wrong number of arguments. (Damien)
+
+commit 4d919d748e4e435edb135aa5ccf6ee7de9212023
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 5 22:36:41 2016 +0100
+
+ patch 7.4.1263
+ Problem: ch_open() hangs when the server isn't running.
+ Solution: Add a timeout. Use a dict to pass arguments. (Yasuhiro Matsumoto)
+
+commit a07fec9c85d062acd9dd433a2e681770f459ba47
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Fri Feb 5 21:04:08 2016 +0100
+
+ patch 7.4.1262
+ Problem: The channel callback is not invoked.
+ Solution: Make a list of pending callbacks.
+
+commit 4b6a6dcbe7bd13170c4884cc17acb1eac2c633d1
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 22:49:49 2016 +0100
+
+ patch 7.4.1261
+ Problem: Pending channel messages are garbage collected. Leaking memory in
+ ch_sendexpr(). Leaking memory for a decoded JSON string.
+ Solution: Mark the message list as used. Free the encoded JSON. Don't save
+ the JSON string.
+
+commit a8343c1808f2f268282f3030ce4adaf22e8ade54
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 22:09:48 2016 +0100
+
+ patch 7.4.1260
+ Problem: The channel feature doesn't work on Win32 GUI.
+ Solution: Use WSAGetLastError(). (Ken Takata)
+
+commit 3fc3e14282c182c046d1335f3d576bc0eeb605c5
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 21:53:33 2016 +0100
+
+ patch 7.4.1259
+ Problem: No test for what patch 7.3.414 fixed.
+ Solution: Add a test. (Elias Diem)
+
+commit a02b321686d9827ac806353ea8af780676da340d
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 21:03:33 2016 +0100
+
+ patch 7.4.1258
+ Problem: The channel test can fail if messages arrive later.
+ Solution: Add a short sleep. (Jun T.)
+
+commit 681baaf4a4c81418693dcafb81421a8614832e91
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 20:57:07 2016 +0100
+
+ Update runtime files.
+
+commit e24692573a266f5060c06dd80bde264092c90dd5
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 10:54:34 2016 +0100
+
+ patch 7.4.1257
+ Problem: Channel test fails in some configurations.
+ Solution: Add check for the +channel feature.
+
+commit b3e2f00f39d6edafda6e5508a926ebd244997a0f
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Thu Feb 4 00:11:37 2016 +0100
+
+ patch 7.4.1256
+ Problem: On Mac sys.exit(0) doesn't kill the test server.
+ Solution: Use self.server.shutdown(). (Jun Takimoto)
+
+commit 66624ff0d9e1de2fc5eb4f95f3a3a2ed70b10138
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 23:59:43 2016 +0100
+
+ patch 7.4.1255
+ Problem: Crash for channel "eval" command without third argument.
+ Solution: Check for missing argument.
+
+commit 3b05b135e3ee4cfd59983fd63461e8f7642c1713
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 23:25:07 2016 +0100
+
+ patch 7.4.1254
+ Problem: Opening a second channel causes a crash. (Ken Takata)
+ Solution: Don't re-allocate the array with channels.
+
+commit 608a8919cae982cb38e38725a843df47b234dae6
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 22:39:51 2016 +0100
+
+ patch 7.4.1253
+ Problem: Python test server not displaying second of two commands.
+ Solaris doesn't have "pkill --full".
+ Solution: Also echo the second command. Use "pkill -f".
+
+commit e7bed627c89ed80bc4b2d96f542819029adf6e76
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 22:20:29 2016 +0100
+
+ patch 7.4.1252
+ Problem: The channel test server may receive two messages concatenated.
+ Solution: Split the messages.
+
+commit bf087cead956513bcd8d40d70322875c479a1984
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 21:56:42 2016 +0100
+
+ patch 7.4.1251
+ Problem: New test file missing from distribution.
+ Solution: Add src/testdir/*.py.
+
+commit 2212c4154cde0641225782cc4dd1a6483ff2ff35
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 21:45:27 2016 +0100
+
+ patch 7.4.1250
+ Problem: Running tests in shadow directory fails.
+ Solution: Also link testdir/*.py
+
+commit fcb1e3d16832ce06da0dc38ecb7ab9aaa3ee4383
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 21:32:46 2016 +0100
+
+ patch 7.4.1249
+ Problem: Crash when the process a channel is connected to exits.
+ Solution: Use the file descriptor properly. Add a test. (Damien)
+ Also add a test for eval().
+
+commit f92591f7f9fc78d2aced99befe444cb423b26df8
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 20:22:32 2016 +0100
+
+ patch 7.4.1248
+ Problem: Can't reliably stop the channel test server. Can't start the
+ server if the python file is not executable.
+ Solution: Use "pkill" instead of "killall". Run the python file as an
+ argument instead of as an executable.
+
+commit a0f9cd148eaab23b2037d2f543f3b8f5a3a7ad3c
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Wed Feb 3 20:13:24 2016 +0100
+
+ patch 7.4.1247
+ Problem: The channel test doesn't run on MS-Windows.
+ Solution: Make it work on the MS-Windows console. (Ken Takata)
+
+commit 7c764f7bbf71a7a49baae07641efd2ead69e4d08
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 23:33:43 2016 +0100
+
+ Make the python script executable.
+
+commit d7ece1008ee6173afda6d173bed486ae79c1c38a
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 23:23:02 2016 +0100
+
+ patch 7.4.1246
+ Problem: The channel functionality isn't tested.
+ Solution: Add a test using a Python test server.
+
+commit d087566a419cc107adab77db997b184ea0e433ad
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 20:52:42 2016 +0100
+
+ patch 7.4.1245
+ Problem: File missing from distribution.
+ Solution: Add json_test.c.
+
+commit f57969a20a4398f56e3028a6cc1102f9f9286ccf
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 20:47:49 2016 +0100
+
+ patch 7.4.1244
+ Problem: The channel functions don't sort together.
+ Solution: Use a common "ch_" prefix.
+
+commit fbf9c6b6c3bdb1c2eb42ea8c227e8ee021a7a8f2
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 19:43:57 2016 +0100
+
+ patch 7.4.1243
+ Problem: Compiler warning for uninitialized variable.
+ Solution: Initialize it. (Elias Diem)
+
+commit 8d8c509ac8dea59ad07712971d74afae08521f79
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 19:15:38 2016 +0100
+
+ patch 7.4.1242
+ Problem: json_test fails without the eval feature.
+ Solution: Add #ifdef.
+
+commit 04b08c3de68534adff95c8823787299e07ed3b49
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 19:01:55 2016 +0100
+
+ patch 7.4.1241
+ Problem: Missing change in Makefile due to diff mismatch
+ Solution: Update the list of object files.
+
+commit bc073092254df17b282d162d8e8181e8f6a7a356
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 18:50:45 2016 +0100
+
+ patch 7.4.1240
+ Problem: Visual studio tools are noisy.
+ Solution: Suppress startup info. (Mike Williams)
+
+commit df5b27b20ec023274fb0f5347973d5abcde7ddd6
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 18:43:17 2016 +0100
+
+ patch 7.4.1239
+ Problem: JSON message after the first one is dropped.
+ Solution: Put remainder of message back in the queue.
+
+commit 56ead341a75e1a0395eee94a3280c67e2278a57e
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 18:20:08 2016 +0100
+
+ patch 7.4.1238
+ Problem: Can't handle two messages right after each other.
+ Solution: Find the end of the JSON. Read more when incomplete. Add a C
+ test for the JSON decoding.
+
+commit d9ea9069f5ef5b8b9f9e0d0daecdd124e2dcd818
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Tue Feb 2 12:38:02 2016 +0100
+
+ patch 7.4.1237
+ Problem: Can't translate message without adding a line break.
+ Solution: Join the two parts of the message.
+
+commit 885f24fbcae2a39ae496ffb3a1e139379be8fae1
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 22:54:46 2016 +0100
+
+ patch 7.4.1236
+ Problem: When "syntax manual" was used switching between buffers removes
+ the highlighting.
+ Solution: Set the syntax option without changing the value. (Anton
+ Lindqvist)
+
+commit 11e0afa00a8e6c0aa1d50f760b5d5cb62dade038
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 22:41:00 2016 +0100
+
+ patch 7.4.1235
+ Problem: Missing change to eval.c.
+ Solution: Include that change.
+
+commit 5e9b2fa9bb0e6061cf18457c173cd141a5dc9c92
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 22:37:05 2016 +0100
+
+ Updated runtime files and translations.
+
+commit 488a130ea261f02317adc2c2ca93cc6e68cf2c23
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 22:01:10 2016 +0100
+
+ patch 7.4.1234
+ Problem: Demo server only runs with Python 2.
+ Solution: Make it run with Python 3 as well. (Ken Takata)
+
+commit 14ad611ca435d97e8fd0d9ab03ddc982843298ac
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 21:47:13 2016 +0100
+
+ patch 7.4.1233
+ Problem: Channel command may cause a crash.
+ Solution: Check for NULL argument. (Damien)
+
+commit 1357caf31f3e447d99baf8dd6a3243e2ab38567f
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 21:40:14 2016 +0100
+
+ patch 7.4.1232
+ Problem: Compiler warnings when the Sniff feature is enabled.
+ Solution: Add UNUSED.
+
+commit 19d2f1589850d7db1ce77efec052929246f156e2
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 21:38:19 2016 +0100
+
+ patch 7.4.1231
+ Problem: JSON messages are not parsed properly.
+ Solution: Queue received messages.
+
+commit ca568aeec60dd6cc13b4dcf5cec0e0a07113547f
+Author: Bram Moolenaar <Bram@vim.org>
+Date: Mon Feb 1 21:32:58 2016 +0100
+
+ patch 7.4.1230
+ Problem: Win32: opening a channel may hang. Not checking for messages
+ while waiting for characters.
+ Solution: Add a zero timeout. Call parse_queued_messages(). (Yasuhiro
+ Matsumoto)
+
commit 07a61e8ce9dfd44a17d63b4629fb7443cc481a7f
Merge: 67a4e64 fb1f626
Author: Karsten Hopp <karsten@redhat.com>
diff --git a/sources b/sources
index 3038e36..fa56557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab988052e2c79aa5e823c7cdfafef2cb vim-7.4-1229.tar.bz2
+dcec6440f374d0c245fe3db7069aa17a vim-7.4-1344.tar.bz2
diff --git a/vim.spec b/vim.spec
index a45cc28..a0237f5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1229
+%define patchlevel 1344
%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: 2%{?dist}
+Release: 1%{?dist}
License: Vim
Group: Applications/Editors
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -756,6 +756,9 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Wed Feb 17 2016 Karsten Hopp <karsten@redhat.com> 7.4.1344-1
+- patchlevel 1344
+
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.4.1229-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild