073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.281
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.281
073263
Problem:    When a session file has more than one tabpage and 'showtabline' is
073263
	    one the positions may be slightly off.
073263
Solution:   Set 'showtabline' to two while positioning windows.
073263
Files:	    src/ex_docmd.c
073263
073263
073263
*** ../vim-7.4.280/src/ex_docmd.c	2014-04-29 12:15:22.856032651 +0200
073263
--- src/ex_docmd.c	2014-05-07 21:07:56.249296154 +0200
073263
***************
073263
*** 10290,10295 ****
073263
--- 10290,10296 ----
073263
      char_u	*sname;
073263
      win_T	*edited_win = NULL;
073263
      int		tabnr;
073263
+     int		restore_stal = FALSE;
073263
      win_T	*tab_firstwin;
073263
      frame_T	*tab_topframe;
073263
      int		cur_arg_idx = 0;
073263
***************
073263
*** 10399,10404 ****
073263
--- 10400,10418 ----
073263
  #endif
073263
  
073263
      /*
073263
+      * When there are two or more tabpages and 'showtabline' is 1 the tabline
073263
+      * will be displayed when creating the next tab.  That resizes the windows
073263
+      * in the first tab, which may cause problems.  Set 'showtabline' to 2
073263
+      * temporarily to avoid that.
073263
+      */
073263
+     if (p_stal == 1 && first_tabpage->tp_next != NULL)
073263
+     {
073263
+ 	if (put_line(fd, "set stal=2") == FAIL)
073263
+ 	    return FAIL;
073263
+ 	restore_stal = TRUE;
073263
+     }
073263
+ 
073263
+     /*
073263
       * May repeat putting Windows for each tab, when "tabpages" is in
073263
       * 'sessionoptions'.
073263
       * Don't use goto_tabpage(), it may change directory and trigger
073263
***************
073263
*** 10548,10553 ****
073263
--- 10562,10569 ----
073263
  		|| put_eol(fd) == FAIL)
073263
  	    return FAIL;
073263
      }
073263
+     if (restore_stal && put_line(fd, "set stal=1") == FAIL)
073263
+ 	return FAIL;
073263
  
073263
      /*
073263
       * Wipe out an empty unnamed buffer we started in.
073263
*** ../vim-7.4.280/src/version.c	2014-05-07 20:25:30.845273872 +0200
073263
--- src/version.c	2014-05-07 21:11:24.925297981 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     281,
073263
  /**/
073263
073263
-- 
073263
hundred-and-one symptoms of being an internet addict:
073263
122. You ask if the Netaholics Anonymous t-shirt you ordered can be
073263
     sent to you via e-mail.
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///