To: [email protected]

Subject: Patch 7.2.203

Fcc: outbox

From: Bram Moolenaar <[email protected]>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.203

Problem:    When reloading a buffer or doing anything else with a buffer that

	    is not displayed in a visible window, autocommands may be applied

	    to the current window, folds messed up, etc.

Solution:   Instead of using the current window for the hidden buffer use a

	    special window, splitting the current one temporarily.

Files:	    src/fileio.c, src/globals.h, src/gui.c, src/if_perl.xs,

	    src/proto/gui.pro, src/proto/window.pro, src/screen.c,

	    src/structs.h, src/window.c

*** ../vim-7.2.202/src/fileio.c	2009-06-16 15:35:46.000000000 +0200

--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200

***************

*** 8365,8371 ****

  	    /* Execute the modeline settings, but don't set window-local

  	     * options if we are using the current window for another buffer. */

! 	    do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0);

  	    /* restore the current window */

  	    aucmd_restbuf(&aco);

--- 8365,8371 ----

  	    /* Execute the modeline settings, but don't set window-local

  	     * options if we are using the current window for another buffer. */

! 	    do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);

  	    /* restore the current window */

  	    aucmd_restbuf(&aco);

***************

*** 8381,8388 ****

  /*

   * Prepare for executing autocommands for (hidden) buffer "buf".

!  * Search a window for the current buffer.  Save the cursor position and

!  * screen offset.

   * Set "curbuf" and "curwin" to match "buf".

   * When FEAT_AUTOCMD is not defined another version is used, see below.

   */

--- 8381,8388 ----

  /*

   * Prepare for executing autocommands for (hidden) buffer "buf".

!  * Search for a visible window containing the current buffer.  If there isn't

!  * one then use "aucmd_win".

   * Set "curbuf" and "curwin" to match "buf".

   * When FEAT_AUTOCMD is not defined another version is used, see below.

   */

***************

*** 8392,8399 ****

      buf_T	*buf;		/* new curbuf */

  {

      win_T	*win;

! 

!     aco->new_curbuf = buf;

      /* Find a window that is for the new buffer */

      if (buf == curbuf)		/* be quick when buf is curbuf */

--- 8392,8400 ----

      buf_T	*buf;		/* new curbuf */

  {

      win_T	*win;

! #ifdef FEAT_WINDOWS

!     int		save_ea;

! #endif

      /* Find a window that is for the new buffer */

      if (buf == curbuf)		/* be quick when buf is curbuf */

***************

*** 8407,8448 ****

  	win = NULL;

  #endif

!     /*

!      * Prefer to use an existing window for the buffer, it has the least side

!      * effects (esp. if "buf" is curbuf).

!      * Otherwise, use curwin for "buf".  It might make some items in the

!      * window invalid.  At least save the cursor and topline.

!      */

      if (win != NULL)

      {

! 	/* there is a window for "buf", make it the curwin */

! 	aco->save_curwin = curwin;

  	curwin = win;

- 	aco->save_buf = win->w_buffer;

- 	aco->new_curwin = win;

      }

      else

      {

! 	/* there is no window for "buf", use curwin */

! 	aco->save_curwin = NULL;

! 	aco->save_buf = curbuf;

! 	--curbuf->b_nwindows;

  	curwin->w_buffer = buf;

  	++buf->b_nwindows;

! 	/* save cursor and topline, set them to safe values */

! 	aco->save_cursor = curwin->w_cursor;

! 	curwin->w_cursor.lnum = 1;

! 	curwin->w_cursor.col = 0;

! 	aco->save_topline = curwin->w_topline;

! 	curwin->w_topline = 1;

! #ifdef FEAT_DIFF

! 	aco->save_topfill = curwin->w_topfill;

! 	curwin->w_topfill = 0;

  #endif

      }

- 

      curbuf = buf;

  }

  /*

--- 8408,8460 ----

  	win = NULL;

  #endif

!     /* Allocate "aucmd_win" when needed.  If this fails (out of memory) fall

!      * back to using the current window. */

!     if (win == NULL && aucmd_win == NULL)

!     {

! 	win_alloc_aucmd_win();

! 	if (aucmd_win == NULL)

! 	    win = curwin;

!     }

! 

!     aco->save_curwin = curwin;

!     aco->save_curbuf = curbuf;

      if (win != NULL)

      {

! 	/* There is a window for "buf" in the current tab page, make it the

! 	 * curwin.  This is preferred, it has the least side effects (esp. if

! 	 * "buf" is curbuf). */

  	curwin = win;

      }

      else

      {

! 	/* There is no window for "buf", use "aucmd_win".  To minimize the side

! 	 * effects, insert it in a the current tab page.

! 	 * Anything related to a window (e.g., setting folds) may have

! 	 * unexpected results. */

! 	curwin = aucmd_win;

  	curwin->w_buffer = buf;

  	++buf->b_nwindows;

! #ifdef FEAT_WINDOWS

! 	/* Split the current window, put the aucmd_win in the upper half. */

! 	make_snapshot(SNAP_AUCMD_IDX);

! 	save_ea = p_ea;

! 	p_ea = FALSE;

! 	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);

! 	(void)win_comp_pos();   /* recompute window positions */

! 	p_ea = save_ea;

! #endif

! 	/* set cursor and topline to safe values */

! 	curwin_init();

! #ifdef FEAT_VERTSPLIT

! 	curwin->w_wincol = 0;

! 	curwin->w_width = Columns;

  #endif

      }

      curbuf = buf;

+     aco->new_curwin = curwin;

+     aco->new_curbuf = curbuf;

  }

  /*

***************

*** 8454,8474 ****

  aucmd_restbuf(aco)

      aco_save_T	*aco;		/* structure holding saved values */

  {

!     if (aco->save_curwin != NULL)

      {

  	/* restore curwin */

  #ifdef FEAT_WINDOWS

  	if (win_valid(aco->save_curwin))

  #endif

  	{

! 	    /* restore the buffer which was previously edited by curwin, if

! 	     * it's still the same window and it's valid */

  	    if (curwin == aco->new_curwin

! 		    && buf_valid(aco->save_buf)

! 		    && aco->save_buf->b_ml.ml_mfp != NULL)

  	    {

  		--curbuf->b_nwindows;

! 		curbuf = aco->save_buf;

  		curwin->w_buffer = curbuf;

  		++curbuf->b_nwindows;

  	    }

--- 8466,8551 ----

  aucmd_restbuf(aco)

      aco_save_T	*aco;		/* structure holding saved values */

  {

! #ifdef FEAT_WINDOWS

!     int dummy;

! #endif

! 

!     if (aco->new_curwin == aucmd_win)

!     {

! 	--curbuf->b_nwindows;

! #ifdef FEAT_WINDOWS

! 	/* Find "aucmd_win", it can't be closed, but it may be in another tab

! 	 * page. */

! 	if (curwin != aucmd_win)

! 	{

! 	    tabpage_T	*tp;

! 	    win_T	*wp;

! 

! 	    FOR_ALL_TAB_WINDOWS(tp, wp)

! 	    {

! 		if (wp == aucmd_win)

! 		{

! 		    if (tp != curtab)

! 			goto_tabpage_tp(tp);

! 		    win_goto(aucmd_win);

! 		    break;

! 		}

! 	    }

! 	}

! 

! 	/* Remove the window and frame from the tree of frames. */

! 	(void)winframe_remove(curwin, &dummy, NULL);

! 	win_remove(curwin, NULL);

! 	last_status(FALSE);	    /* may need to remove last status line */

! 	restore_snapshot(SNAP_AUCMD_IDX, FALSE);

! 	(void)win_comp_pos();   /* recompute window positions */

! 

! 	if (win_valid(aco->save_curwin))

! 	    curwin = aco->save_curwin;

! 	else

! 	    /* Hmm, original window disappeared.  Just use the first one. */

! 	    curwin = firstwin;

! # ifdef FEAT_EVAL

! 	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */

! # endif

! #else

! 	curwin = aco->save_curwin;

! #endif

! 	curbuf = curwin->w_buffer;

! 

! 	/* the buffer contents may have changed */

! 	check_cursor();

! 	if (curwin->w_topline > curbuf->b_ml.ml_line_count)

! 	{

! 	    curwin->w_topline = curbuf->b_ml.ml_line_count;

! #ifdef FEAT_DIFF

! 	    curwin->w_topfill = 0;

! #endif

! 	}

! #if defined(FEAT_GUI)

! 	/* Hide the scrollbars from the aucmd_win and update. */

! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);

! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);

! 	gui_may_update_scrollbars();

! #endif

!     }

!     else

      {

  	/* restore curwin */

  #ifdef FEAT_WINDOWS

  	if (win_valid(aco->save_curwin))

  #endif

  	{

! 	    /* Restore the buffer which was previously edited by curwin, if

! 	     * it was chagned, we are still the same window and the buffer is

! 	     * valid. */

  	    if (curwin == aco->new_curwin

! 		    && curbuf != aco->new_curbuf

! 		    && buf_valid(aco->new_curbuf)

! 		    && aco->new_curbuf->b_ml.ml_mfp != NULL)

  	    {

  		--curbuf->b_nwindows;

! 		curbuf = aco->new_curbuf;

  		curwin->w_buffer = curbuf;

  		++curbuf->b_nwindows;

  	    }

***************

*** 8477,8510 ****

  	    curbuf = curwin->w_buffer;

  	}

      }

-     else

-     {

- 	/* restore buffer for curwin if it still exists and is loaded */

- 	if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL)

- 	{

- 	    --curbuf->b_nwindows;

- 	    curbuf = aco->save_buf;

- 	    curwin->w_buffer = curbuf;

- 	    ++curbuf->b_nwindows;

- 	    curwin->w_cursor = aco->save_cursor;

- 	    check_cursor();

- 	    /* check topline < line_count, in case lines got deleted */

- 	    if (aco->save_topline <= curbuf->b_ml.ml_line_count)

- 	    {

- 		curwin->w_topline = aco->save_topline;

- #ifdef FEAT_DIFF

- 		curwin->w_topfill = aco->save_topfill;

- #endif

- 	    }

- 	    else

- 	    {

- 		curwin->w_topline = curbuf->b_ml.ml_line_count;

- #ifdef FEAT_DIFF

- 		curwin->w_topfill = 0;

- #endif

- 	    }

- 	}

-     }

  }

  static int	autocmd_nested = FALSE;

--- 8554,8559 ----

***************

*** 9419,9427 ****

      aco_save_T	*aco;		/* structure to save values in */

      buf_T	*buf;		/* new curbuf */

  {

!     aco->save_buf = curbuf;

      curbuf = buf;

      curwin->w_buffer = buf;

  }

  /*

--- 9468,9478 ----

      aco_save_T	*aco;		/* structure to save values in */

      buf_T	*buf;		/* new curbuf */

  {

!     aco->save_curbuf = curbuf;

!     --curbuf->b_nwindows;

      curbuf = buf;

      curwin->w_buffer = buf;

+     ++curbuf->b_nwindows;

  }

  /*

***************

*** 9432,9439 ****

  aucmd_restbuf(aco)

      aco_save_T	*aco;		/* structure holding saved values */

  {

!     curbuf = aco->save_buf;

      curwin->w_buffer = curbuf;

  }

  #endif	/* FEAT_AUTOCMD */

--- 9483,9492 ----

  aucmd_restbuf(aco)

      aco_save_T	*aco;		/* structure holding saved values */

  {

!     --curbuf->b_nwindows;

!     curbuf = aco->save_curbuf;

      curwin->w_buffer = curbuf;

+     ++curbuf->b_nwindows;

  }

  #endif	/* FEAT_AUTOCMD */

*** ../vim-7.2.202/src/globals.h	2009-06-16 15:23:07.000000000 +0200

--- src/globals.h	2009-06-12 21:10:30.000000000 +0200

***************

*** 539,544 ****

--- 539,548 ----

  EXTERN win_T	*curwin;	/* currently active window */

+ #ifdef FEAT_AUTOCMD

+ EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */

+ #endif

+ 

  /*

   * The window layout is kept in a tree of frames.  topframe points to the top

   * of the tree.

*** ../vim-7.2.202/src/gui.c	2009-05-21 23:25:38.000000000 +0200

--- src/gui.c	2009-06-11 20:58:05.000000000 +0200

***************

*** 3879,3884 ****

--- 3879,3899 ----

   * Scrollbar stuff:

   */

+ /*

+  * Called when something in the window layout has changed.

+  */

+     void

+ gui_may_update_scrollbars()

+ {

+     if (gui.in_use && starting == 0)

+     {

+ 	out_flush();

+ 	gui_init_which_components(NULL);

+ 	gui_update_scrollbars(TRUE);

+     }

+     need_mouse_correct = TRUE;

+ }

+ 

      void

  gui_update_scrollbars(force)

      int		force;	    /* Force all scrollbars to get updated */

*** ../vim-7.2.202/src/if_perl.xs	2008-12-03 13:18:16.000000000 +0100

--- src/if_perl.xs	2009-06-03 17:52:51.000000000 +0200

***************

*** 1234,1240 ****

  		    {

  			ml_delete(lnum, 0);

  			deleted_lines_mark(lnum, 1L);

! 			if (aco.save_buf == curbuf)

  			    check_cursor();

  		    }

--- 1236,1242 ----

  		    {

  			ml_delete(lnum, 0);

  			deleted_lines_mark(lnum, 1L);

! 			if (aco.save_curbuf == curbuf)

  			    check_cursor();

  		    }

*** ../vim-7.2.202/src/proto/gui.pro	2007-05-05 19:42:19.000000000 +0200

--- src/proto/gui.pro	2009-06-11 20:58:08.000000000 +0200

***************

*** 43,48 ****

--- 43,49 ----

  void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));

  scrollbar_T *gui_find_scrollbar __ARGS((long ident));

  void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));

+ void gui_may_update_scrollbars __ARGS((void));

  void gui_update_scrollbars __ARGS((int force));

  int gui_do_scroll __ARGS((void));

  int gui_do_horiz_scroll __ARGS((void));

*** ../vim-7.2.202/src/proto/window.pro	2007-07-26 22:57:45.000000000 +0200

--- src/proto/window.pro	2009-06-10 21:20:39.000000000 +0200

***************

*** 1,6 ****

--- 1,7 ----

  /* window.c */

  void do_window __ARGS((int nchar, long Prenum, int xchar));

  int win_split __ARGS((int size, int flags));

+ int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));

  int win_valid __ARGS((win_T *win));

  int win_count __ARGS((void));

  int make_windows __ARGS((int count, int vertical));

***************

*** 10,18 ****

--- 11,21 ----

  void win_close __ARGS((win_T *win, int free_buf));

  void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));

  void win_free_all __ARGS((void));

+ win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));

  void close_others __ARGS((int message, int forceit));

  void curwin_init __ARGS((void));

  int win_alloc_first __ARGS((void));

+ void win_alloc_aucmd_win __ARGS((void));

  void win_init_size __ARGS((void));

  void free_tabpage __ARGS((tabpage_T *tp));

  int win_new_tabpage __ARGS((int after));

***************

*** 30,35 ****

--- 33,40 ----

  void win_enter __ARGS((win_T *wp, int undo_sync));

  win_T *buf_jump_open_win __ARGS((buf_T *buf));

  win_T *buf_jump_open_tab __ARGS((buf_T *buf));

+ void win_append __ARGS((win_T *after, win_T *wp));

+ void win_remove __ARGS((win_T *wp, tabpage_T *tp));

  int win_alloc_lines __ARGS((win_T *wp));

  void win_free_lsize __ARGS((win_T *wp));

  void shell_new_rows __ARGS((void));

***************

*** 58,63 ****

--- 63,70 ----

  int min_rows __ARGS((void));

  int only_one_window __ARGS((void));

  void check_lnums __ARGS((int do_curwin));

+ void make_snapshot __ARGS((int idx));

+ void restore_snapshot __ARGS((int idx, int close_curwin));

  int win_hasvertsplit __ARGS((void));

  int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));

  int match_delete __ARGS((win_T *wp, int id, int perr));

*** ../vim-7.2.202/src/screen.c	2009-05-17 13:30:58.000000000 +0200

--- src/screen.c	2009-06-10 16:41:45.000000000 +0200

***************

*** 7495,7500 ****

--- 7495,7504 ----

  #endif

  	}

      }

+ #ifdef FEAT_AUTOCMD

+     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)

+ 	outofmem = TRUE;

+ #endif

  #ifdef FEAT_WINDOWS

  give_up:

  #endif

*** ../vim-7.2.202/src/structs.h	2009-05-16 16:36:25.000000000 +0200

--- src/structs.h	2009-06-13 12:51:56.000000000 +0200

***************

*** 1621,1626 ****

--- 1621,1634 ----

  };

  #endif

+ #define SNAP_HELP_IDX	0

+ #ifdef FEAT_AUTOCMD

+ # define SNAP_AUCMD_IDX 1

+ # define SNAP_COUNT	2

+ #else

+ # define SNAP_COUNT	1

+ #endif

+ 

  /*

   * Tab pages point to the top frame of each tab page.

   * Note: Most values are NOT valid for the current tab page!  Use "curwin",

***************

*** 1649,1655 ****

      buf_T	    *(tp_diffbuf[DB_COUNT]);

      int		    tp_diff_invalid;	/* list of diffs is outdated */

  #endif

!     frame_T	    *tp_snapshot;    /* window layout snapshot */

  #ifdef FEAT_EVAL

      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */