Mercurial > vim

comparison src/eval.c @ 5132:a68629544891 v7.3.1309

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1309 Problem: When a script defines a function the flag to wait for the user to hit enter is reset. Solution: Restore the flag. (Yasuhiro Matsumoto) Except when the user was typing the function.
author Bram Moolenaar <bram@vim.org>
date Fri, 05 Jul 2013 18:29:48 +0200
parents 6e611380b4cf
children 2374a05efe20
comparison
equal deleted inserted replaced
5131:99797d166c1f 5132:a68629544891
21106 char_u *theline; 21106 char_u *theline;
21107 int i; 21107 int i;
21108 int j; 21108 int j;
21109 int c; 21109 int c;
21110 int saved_did_emsg; 21110 int saved_did_emsg;
21111 int saved_wait_return = need_wait_return;
21111 char_u *name = NULL; 21112 char_u *name = NULL;
21112 char_u *p; 21113 char_u *p;
21113 char_u *arg; 21114 char_u *arg;
21114 char_u *line_arg = NULL; 21115 char_u *line_arg = NULL;
21115 garray_T newargs; 21116 garray_T newargs;
21437 indent = 2; 21438 indent = 2;
21438 nesting = 0; 21439 nesting = 0;
21439 for (;;) 21440 for (;;)
21440 { 21441 {
21441 if (KeyTyped) 21442 if (KeyTyped)
21443 {
21442 msg_scroll = TRUE; 21444 msg_scroll = TRUE;
21445 saved_wait_return = FALSE;
21446 }
21443 need_wait_return = FALSE; 21447 need_wait_return = FALSE;
21444 sourcing_lnum_off = sourcing_lnum; 21448 sourcing_lnum_off = sourcing_lnum;
21445 21449
21446 if (line_arg != NULL) 21450 if (line_arg != NULL)
21447 { 21451 {
21748 ret_free: 21752 ret_free:
21749 vim_free(skip_until); 21753 vim_free(skip_until);
21750 vim_free(fudi.fd_newkey); 21754 vim_free(fudi.fd_newkey);
21751 vim_free(name); 21755 vim_free(name);
21752 did_emsg |= saved_did_emsg; 21756 did_emsg |= saved_did_emsg;
21757 need_wait_return |= saved_wait_return;
21753 } 21758 }
21754 21759
21755 /* 21760 /*
21756 * Get a function name, translating "<SID>" and "<SNR>". 21761 * Get a function name, translating "<SID>" and "<SNR>".
21757 * Also handles a Funcref in a List or Dictionary. 21762 * Also handles a Funcref in a List or Dictionary.