To: vim-dev@vim.org
Subject: Patch 6.1.474
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.474
Problem:    When opening the command-line window in Ex mode it's impossible to
	    go back. (Pavol Juhas)
Solution:   Reset "exmode_active" and restore it when the command-line window
	    is closed.
Files:	    src/ex_getln.c


*** ../vim61.473/src/ex_getln.c	Sat Mar 15 17:55:18 2003
--- src/ex_getln.c	Sat Apr 19 16:06:43 2003
***************
*** 4380,4385 ****
--- 4491,4497 ----
      char_u		typestr[2];
      int			save_restart_edit = restart_edit;
      int			save_State = State;
+     int			save_exmode = exmode_active;
  
      /* Can't do this recursively.  Can't do it when typing a password. */
      if (cmdwin_type != 0
***************
*** 4467,4472 ****
--- 4579,4587 ----
      ccline.cmdbuff = NULL;
      ccline.cmdprompt = NULL;
  
+     /* No Ex mode here! */
+     exmode_active = 0;
+ 
      State = NORMAL;
  # ifdef FEAT_MOUSE
      setmouse();
***************
*** 4499,4504 ****
--- 4614,4621 ----
      ccline = save_ccline;
      cmdwin_type = 0;
  
+     exmode_active = save_exmode;
+ 
      /* Safety check: The old window or buffer was deleted: It's a a bug when
       * this happens! */
      if (!win_valid(old_curwin) || !buf_valid(old_curbuf))
*** ../vim61.473/src/version.c	Mon Apr 21 19:08:32 2003
--- src/version.c	Mon Apr 21 19:10:18 2003
***************
*** 613,614 ****
--- 618,621 ----
  {   /* Add new patch number below this line */
+ /**/
+     474,
  /**/

-- 
The technology involved in making anything invisible is so infinitely
complex that nine hundred and ninety-nine billion, nine hundred and
ninety-nine million, nine hundred and ninety-nine thousand, nine hundred
and ninety-nine times out of a trillion it is much simpler and more
effective just to take the thing away and do without it.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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 ///