3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.337
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.337
3ef2ca
Problem:    When there is an error preparing to edit the command line, the
3ef2ca
	    command won't be executed. (Hirohito Higashi)
3ef2ca
Solution:   Reset did_emsg before editing.
3ef2ca
Files:	    src/ex_getln.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.336/src/ex_getln.c	2014-06-12 19:44:45.324549030 +0200
3ef2ca
--- src/ex_getln.c	2014-06-25 12:06:38.018001402 +0200
3ef2ca
***************
3ef2ca
*** 342,347 ****
3ef2ca
--- 342,354 ----
3ef2ca
      do_digraph(-1);		/* init digraph typeahead */
3ef2ca
  #endif
3ef2ca
  
3ef2ca
+     /* If something above caused an error, reset the flags, we do want to type
3ef2ca
+      * and execute commands. Display may be messed up a bit. */
3ef2ca
+     if (did_emsg)
3ef2ca
+ 	redrawcmd();
3ef2ca
+     did_emsg = FALSE;
3ef2ca
+     got_int = FALSE;
3ef2ca
+ 
3ef2ca
      /*
3ef2ca
       * Collect the command string, handling editing keys.
3ef2ca
       */
3ef2ca
*** ../vim-7.4.336/src/version.c	2014-06-25 11:48:40.733960646 +0200
3ef2ca
--- src/version.c	2014-06-25 12:24:39.442042313 +0200
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     337,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Computers are not intelligent.  They only think they are.
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///