To: vim-dev@vim.org
Subject: Patch 6.2f.012
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.2f.012
Problem:    ":echoerr" doesn't work correctly inside try/endtry.
Solution:   Don't reset did_emsg inside a try/endtry. (Servatius Brandt)
Files:	    src/eval.c


*** ../vim-6.2f.011/src/eval.c	Mon May 26 22:15:07 2003
--- src/eval.c	Wed May 28 20:23:36 2003
***************
*** 8325,8331 ****
  	    /* We don't want to abort following commands, restore did_emsg. */
  	    save_did_emsg = did_emsg;
  	    EMSG((char_u *)ga.ga_data);
! 	    did_emsg = save_did_emsg;
  	}
  	else if (eap->cmdidx == CMD_execute)
  	    do_cmdline((char_u *)ga.ga_data,
--- 8325,8332 ----
  	    /* We don't want to abort following commands, restore did_emsg. */
  	    save_did_emsg = did_emsg;
  	    EMSG((char_u *)ga.ga_data);
! 	    if (!force_abort)
! 		did_emsg = save_did_emsg;
  	}
  	else if (eap->cmdidx == CMD_execute)
  	    do_cmdline((char_u *)ga.ga_data,
*** ../vim-6.2f.011/src/version.c	Wed May 28 20:13:11 2003
--- src/version.c	Wed May 28 20:26:43 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     12,
  /**/

-- 
It's totally unfair to suggest - as many have - that engineers are socially
inept.  Engineers simply have different objectives when it comes to social
interaction.
				(Scott Adams - The Dilbert principle)

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