Mercurial > vim

diff src/proto/diff.pro @ 6314:df92c2b2a179 v7.4.490

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.490 Problem: Cannot specify the buffer to use for "do" and "dp", making them useless for three-way diff. Solution: Use the count as the buffer number. (James McCoy)
author Bram Moolenaar <bram@vim.org>
date Fri, 31 Oct 2014 13:54:25 +0100
parents 99c1eba60b2d
children 21b0a39d13ed
line wrap: on
line diff
--- a/src/proto/diff.pro
+++ b/src/proto/diff.pro
@@ -18,7 +18,7 @@ int diffopt_changed __ARGS((void));
 int diffopt_horizontal __ARGS((void));
 int diff_find_change __ARGS((win_T *wp, linenr_T lnum, int *startp, int *endp));
 int diff_infold __ARGS((win_T *wp, linenr_T lnum));
-void nv_diffgetput __ARGS((int put));
+void nv_diffgetput __ARGS((int put, long count));
 void ex_diffgetput __ARGS((exarg_T *eap));
 int diff_mode_buf __ARGS((buf_T *buf));
 int diff_move_to __ARGS((int dir, long count));