On Oct 28, 2014 9:34 PM, "James McCoy" <[email protected]> wrote: > > Needing to fallback to :diffget/:diffput instead of do/dp when dealing > with a 3-way diff has always bothered me. I've been having to do that > more lately, so the attached patch turns a supplied [count] for do/dp > into the [bufspec] for :diffget/:diffput. > > Obviously, it's not as expressive as being able to use the full bufspec, > but, at least for me, I always know the buffer number, so providing the > count is much quicker.
Updated patch to correctly calculate string size and handle memory allocation failure. https <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> :// <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> github.com <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> /jamessan/vim/compare/ <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> pu <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> / <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> diffput-count~ <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> ... <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> pu <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> / <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> diffput-count.diff <https://github.com/jamessan/vim/compare/pu/diffput-count~...pu/diffput-count.diff> -- -- 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.
