073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.337
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.337
073263
Problem:    When there is an error preparing to edit the command line, the
073263
	    command won't be executed. (Hirohito Higashi)
073263
Solution:   Reset did_emsg before editing.
073263
Files:	    src/ex_getln.c
073263
073263
073263
*** ../vim-7.4.336/src/ex_getln.c	2014-06-12 19:44:45.324549030 +0200
073263
--- src/ex_getln.c	2014-06-25 12:06:38.018001402 +0200
073263
***************
073263
*** 342,347 ****
073263
--- 342,354 ----
073263
      do_digraph(-1);		/* init digraph typeahead */
073263
  #endif
073263
  
073263
+     /* If something above caused an error, reset the flags, we do want to type
073263
+      * and execute commands. Display may be messed up a bit. */
073263
+     if (did_emsg)
073263
+ 	redrawcmd();
073263
+     did_emsg = FALSE;
073263
+     got_int = FALSE;
073263
+ 
073263
      /*
073263
       * Collect the command string, handling editing keys.
073263
       */
073263
*** ../vim-7.4.336/src/version.c	2014-06-25 11:48:40.733960646 +0200
073263
--- src/version.c	2014-06-25 12:24:39.442042313 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     337,
073263
  /**/
073263
073263
-- 
073263
Computers are not intelligent.  They only think they are.
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    ///