Blame SOURCES/7.4.337

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