]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.308 v7.4.308
authorBram Moolenaar <Bram@vim.org>
Wed, 28 May 2014 09:35:37 +0000 (11:35 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 28 May 2014 09:35:37 +0000 (11:35 +0200)
Problem:    When using ":diffsplit" on an empty file the cursor is displayed
            on the command line.
Solution:   Limit the value of w_topfill.

src/diff.c
src/version.c

index 49ca58af7c3016315fadbd79a28448e0419f097e..98b791a72025c33a8e022f051288a53efed7028a 100644 (file)
@@ -622,6 +622,7 @@ diff_redraw(dofold)
                    wp->w_topfill = (n < 0 ? 0 : n);
                else if (n > 0 && n > wp->w_topfill)
                    wp->w_topfill = n;
+               check_topfill(wp, FALSE);
            }
        }
 }
index 41f1b46f2e23e1463a0c54c9e9b5d9da0f187f4f..f72ae97f2833e99fff8274472bd37084ef488555 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    308,
 /**/
     307,
 /**/