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