Markus Braun wrote:
> I often use diffput and diffget on a block of changes. It seems that version > 8.1.400 introduced an error. Version 8.1.399 works correctly. > > When there is more than one change in the block that gets put or get then the > order of the lines in the destination buffer is wrong. The following > commands reproduce the error: > > # echo -e ' 1\n 2\n 3\n 4\n 5\n 6\n 7\n 8\n 9\n10\n' > file_a > # echo -e ' 1\n 2\n 3\n 4\n 6\n 7\n 9\n10\n' > file_b > # vim -u NONE -d file_a file_b -c "%diffput" > > file_b will contain (7 is inserted in the wrong line): > > > 1 > > 2 > > 3 > > 4 > > 5 > > 6 > > 8 > > 7 > > 9 > > 10 Thanks for the example! I had noticed a problem before, but could not reproduce it. I'll fix it and use your example for a test. -- Edison's greatest achievement came in 1879, when he invented the electric company. Edison's design was a brilliant adaptation of the simple electrical circuit: the electric company sends electricity through a wire to a customer, then immediately gets the electricity back through another wire /// 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.
