To: vim-dev@vim.org Subject: Patch 6.0.252 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.252 Problem: When a user function was defined with "abort", an error that is not inside if/endif or while/endwhile doesn't abort the function. (Servatius Brandt) Solution: Don't reset did_emsg when the function is to be aborted. Files: src/ex_docmd.c *** ../vim60.251/src/ex_docmd.c Mon Feb 18 15:56:19 2002 --- src/ex_docmd.c Thu Feb 21 19:32:23 2002 *************** *** 637,643 **** /* stop skipping cmds for an error msg after all endifs and endwhiles */ if (next_cmdline == NULL #ifdef FEAT_EVAL ! && cstack.cs_idx < 0 #endif ) did_emsg = FALSE; --- 637,644 ---- /* stop skipping cmds for an error msg after all endifs and endwhiles */ if (next_cmdline == NULL #ifdef FEAT_EVAL ! && cstack.cs_idx < 0 ! && !(getline == get_func_line && func_has_ended(cookie)) #endif ) did_emsg = FALSE; *** ../vim60.251/src/version.c Thu Feb 21 19:25:18 2002 --- src/version.c Thu Feb 21 19:34:38 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 252, /**/ -- For humans, honesty is a matter of degree. Engineers are always honest in matters of technology and human relationships. That's why it's a good idea to keep engineers away from customers, romantic interests, and other people who can't handle the thruth. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///