patch 7.4.2279

Problem:    Starting diff mode with the cursor in the last line might end up
            only showing one closed fold. (John Beckett)
Solution:   Scroll the window to show the same relative cursor position.

diff --git a/src/diff.c b/src/diff.c
index 35e29fcdf916b20098b2f18df27b8a891e8f9d8f..05ca7ac250a010221a7babb7b304a395ded509f0 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -1075,6 +1075,10 @@ ex_diffsplit(exarg_T *eap)
 #ifdef FEAT_GUI
     need_mouse_correct = TRUE;
 #endif
+    /* Need to compute w_fraction when no redraw happened yet. */
+    validate_cursor();
+    set_fraction(curwin);
+
     /* don't use a new tab page, each tab page has its own diffs */
     cmdmod.tab = 0;
 
@@ -1101,6 +1105,9 @@ ex_diffsplit(exarg_T *eap)
                            curbuf,
                            curwin->w_cursor.lnum);
            }
+           /* Now that lines are folded scroll to show the cursor at the same
+            * relative position. */
+           scroll_to_fraction(curwin, curwin->w_height);
        }
     }
 }

diff --git a/src/proto/window.pro b/src/proto/window.pro
index d82988e30b8c735454dc254679a39dfbee0371e9..8b649dbf15b2d5119f73951d87c14ce72bae353a 100644 (file)
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -56,6 +56,7 @@ void win_drag_status_line(win_T *dragwin, int offset);
 void win_drag_vsep_line(win_T *dragwin, int offset);
 void set_fraction(win_T *wp);
 void win_new_height(win_T *wp, int height);
+void scroll_to_fraction(win_T *wp, int prev_height);
 void win_new_width(win_T *wp, int width);
 void win_comp_scroll(win_T *wp);
 void command_height(void);

diff --git a/src/version.c b/src/version.c
index 6f4be8e347e163e60bb52b4a8adabbde77788496..007a56c5984d6ad68f71dcc8d654efd71f926a38 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2279,
 /**/
     2278,
 /**/

diff --git a/src/window.c b/src/window.c
index 65d8b36ea99289e95e3c47a4f62dac823e27c5f0..6943c8fe3436e280e694165e43bfdfb26dff5e1d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -5674,8 +5674,6 @@ set_fraction(win_T *wp)
     void
 win_new_height(win_T *wp, int height)
 {
-    linenr_T   lnum;
-    int                sline, line_size;
     int                prev_height = wp->w_height;
 
     /* Don't want a negative height.  Happens when splitting a tiny window.
@@ -5701,6 +5699,16 @@ win_new_height(win_T *wp, int height)
     wp->w_height = height;
     wp->w_skipcol = 0;
 
+    scroll_to_fraction(wp, prev_height);
+}
+
+    void
+scroll_to_fraction(win_T *wp, int prev_height)
+{
+    linenr_T   lnum;
+    int                sline, line_size;
+    int                height = wp->w_height;
+
     /* Don't change w_topline when height is zero.  Don't set w_topline when
      * 'scrollbind' is set and this isn't the current window. */
     if (height > 0