aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.3.608

Browse Source 
Problem:    winrestview() does not always restore the view correctly.
Solution:   Call win_new_height() and win_new_width(). (Lech Lorens)
This commit is contained in:
Bram Moolenaar
2012-07-19 18:05:44 +02:00
parent 049d8e79cf
commit 6763c140d6
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eval.c
View File

@@ -18601,6 +18601,10 @@ f_winrestview(argvars, rettv)
curwin->w_skipcol = get_dict_number(dict, (char_u *)"skipcol"); curwin->w_skipcol = get_dict_number(dict, (char_u *)"skipcol");
check_cursor(); check_cursor();
win_new_height(curwin, curwin->w_height);
# ifdef FEAT_VERTSPLIT
win_new_width(curwin, W_WIDTH(curwin));
# endif
changed_window_setting(); changed_window_setting();
if (curwin->w_topline == 0) if (curwin->w_topline == 0)

2
src/proto/window.pro
View File

@@ -51,6 +51,8 @@ void win_setwidth_win __ARGS((int width, win_T *wp));
void win_setminheight __ARGS((void)); void win_setminheight __ARGS((void));
void win_drag_status_line __ARGS((win_T *dragwin, int offset)); void win_drag_status_line __ARGS((win_T *dragwin, int offset));
void win_drag_vsep_line __ARGS((win_T *dragwin, int offset)); void win_drag_vsep_line __ARGS((win_T *dragwin, int offset));
void win_new_height __ARGS((win_T *wp, int height));
void win_new_width __ARGS((win_T *wp, int width));
void win_comp_scroll __ARGS((win_T *wp)); void win_comp_scroll __ARGS((win_T *wp));
void command_height __ARGS((void)); void command_height __ARGS((void));
void last_status __ARGS((int morewin)); void last_status __ARGS((int morewin));

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
608,
/**/ /**/
607, 607,
/**/ /**/

6
src/window.c
View File

@@ -54,7 +54,6 @@ static void frame_append __ARGS((frame_T *after, frame_T *frp));
static void frame_insert __ARGS((frame_T *before, frame_T *frp)); static void frame_insert __ARGS((frame_T *before, frame_T *frp));
static void frame_remove __ARGS((frame_T *frp)); static void frame_remove __ARGS((frame_T *frp));
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
static void win_new_width __ARGS((win_T *wp, int width));
static void win_goto_ver __ARGS((int up, long count)); static void win_goto_ver __ARGS((int up, long count));
static void win_goto_hor __ARGS((int left, long count)); static void win_goto_hor __ARGS((int left, long count));
#endif #endif
@@ -71,7 +70,6 @@ static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
static win_T *win_alloc __ARGS((win_T *after, int hidden)); static win_T *win_alloc __ARGS((win_T *after, int hidden));
static void set_fraction __ARGS((win_T *wp)); static void set_fraction __ARGS((win_T *wp));
static void win_new_height __ARGS((win_T *wp, int height));
#define URL_SLASH 1 /* path_is_url() has found "://" */ #define URL_SLASH 1 /* path_is_url() has found "://" */
#define URL_BACKSLASH 2 /* path_is_url() has found ":\\" */ #define URL_BACKSLASH 2 /* path_is_url() has found ":\\" */
@@ -5557,7 +5555,7 @@ set_fraction(wp)
* This takes care of the things inside the window, not what happens to the * This takes care of the things inside the window, not what happens to the
* window position, the frame or to other windows. * window position, the frame or to other windows.
*/ */
static void void
win_new_height(wp, height) win_new_height(wp, height)
win_T *wp; win_T *wp;
int height; int height;
@@ -5697,7 +5695,7 @@ win_new_height(wp, height)
/* /*
* Set the width of a window. * Set the width of a window.
*/ */
static void void
win_new_width(wp, width) win_new_width(wp, width)
win_T *wp; win_T *wp;
int width; int width;