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)

diff --git a/src/diff.c b/src/diff.c
index d324f99d8713c1501f94eb9eb0bf30df8238b01b..caee6e5a530c2449d57e019eebc954e6c729c046 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -2107,12 +2107,20 @@ diff_infold(wp, lnum)
  * "dp" and "do" commands.
  */
     void
-nv_diffgetput(put)
+nv_diffgetput(put, count)
     int                put;
+    long       count;
 {
     exarg_T    ea;
+    char_u     buf[30];
 
-    ea.arg = (char_u *)"";
+    if (count == 0)
+       ea.arg = (char_u *)"";
+    else
+    {
+       vim_snprintf((char *)buf, 30, "%ld", count);
+       ea.arg = buf;
+    }
     if (put)
        ea.cmdidx = CMD_diffput;
     else

diff --git a/src/normal.c b/src/normal.c
index 0116d058ba93033a5a053ee9878f161ff1cff027..bd5bacd59ad134655d652c2abaea513f10ac9299 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -9284,7 +9284,7 @@ nv_put(cap)
        if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'p')
        {
            clearop(cap->oap);
-           nv_diffgetput(TRUE);
+           nv_diffgetput(TRUE, cap->opcount);
        }
        else
 #endif
@@ -9407,7 +9407,7 @@ nv_open(cap)
     if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'o')
     {
        clearop(cap->oap);
-       nv_diffgetput(FALSE);
+       nv_diffgetput(FALSE, cap->opcount);
     }
     else
 #endif

diff --git a/src/proto/diff.pro b/src/proto/diff.pro
index 18c42651fde17925521f793b84398c6e44d6ed91..3234fde1a6144df961f1137dbd7353b1822efccc 100644 (file)
--- 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));

diff --git a/src/version.c b/src/version.c
index 1ef081855a4263084a16215d23727dd15bb09e25..3fc09c83c55f2a33097de010e23ec5e4b03200c6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    490,
 /**/
     489,
 /**/