To: vim-dev@vim.org
Subject: Patch 6.1.412
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.412
Problem:    When swapping terminal screens and using ":gui" to start the GUI,
	    the shell prompt may be after a hit-enter prompt.
Solution:   Output a newline in the terminal when starting the GUI and there
	    was a hit-enter prompt..
Files:	    src/gui.c


*** ../vim61.411/src/gui.c	Sat Mar 15 17:55:18 2003
--- src/gui.c	Sun Mar 23 16:40:15 2003
***************
*** 133,138 ****
--- 133,143 ----
  		close(pipefd[0]);
  	    }
  
+ 	    /* When swapping screens we may need to go to the next line, e.g.,
+ 	     * after a hit-enter prompt and using ":gui". */
+ 	    if (newline_on_exit)
+ 		mch_errmsg("\r\n");
+ 
  	    /*
  	     * The parent must skip the normal exit() processing, the child
  	     * will do it.  For example, GTK messes up signals when exiting.
*** ../vim61.411/src/version.c	Thu Mar 20 21:33:57 2003
--- src/version.c	Sun Mar 23 20:54:11 2003
***************
*** 613,614 ****
--- 613,616 ----
  {   /* Add new patch number below this line */
+ /**/
+     412,
  /**/

-- 
Wizards had always known that the act of observation changed the thing that
was observed, and sometimes forgot that it also changed the observer too.
			Terry Pratchett  -  Interesting times

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///