Mats Bertil Tegner wrote: > On 2016-02-27 14:44, Bram Moolenaar wrote: > > > > Patch 7.4.1426 > > Problem: The "out-io" option for jobs is not implemented yet. > > Solution: Implement the "buffer" value: append job output to a buffer. > > Files: src/eval.c, src/channel.c, src/structs.h, src/netbeans.c, > > runtime/doc/channel.txt > > This patch fails when patching: > -------------------------- > |*** ../vim-7.4.1425/runtime/doc/channel.txt 2016-02-21 > 20:08:19.546419633 +0100 > |--- runtime/doc/channel.txt 2016-02-27 13:59:46.471276881 +0100 > -------------------------- > patching file runtime/doc/channel.txt > Using Plan A... > Hunk #1 FAILED at 1. > Hunk #2 succeeded at 130. > Hunk #3 FAILED at 162. > Hunk #4 succeeded at 200 (offset 4 lines). > Hunk #5 FAILED at 256. > Hunk #6 succeeded at 330 (offset 5 lines). > Hunk #7 succeeded at 400 (offset 5 lines). > Hunk #8 succeeded at 451 (offset 5 lines). > Hunk #9 succeeded at 514 (offset 5 lines). > Hunk #10 succeeded at 533 (offset 5 lines). > 3 out of 10 hunks FAILED -- saving rejects to file > runtime/doc/channel.txt.rej > Hmm... The next patch looks like a new-style context diff to me... > The text leading up to this was: > -------------------------- > |*** ../vim-7.4.1425/src/version.c 2016-02-26 19:58:44.039326159 +0100 > |--- src/version.c 2016-02-26 23:23:32.502332399 +0100 > -------------------------- > patching file src/version.c > Using Plan A... > Hunk #1 succeeded at 750. > Hmm... Ignoring the trailing garbage. > done > bash-4.3#
Not sure why. Did a previous patch not apply perhaps? The patch applied correctly to my "shadow" version that I use to make the patches against. -- A programmer's wife asks him: "Please run to the store and pick up a loaf of bread. If they have eggs, get a dozen". The programmer comes home with 12 loafs of bread. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
