Mercurial > vim
changeset 4217:6ce32844727d v7.3.860
updated for version 7.3.860
Problem: When using --remote-expr try/catch does not work. (Andrey Radev)
Solution: Set emsg_silent instead of emsg_off.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 13 Mar 2013 20:23:22 +0100 |
| parents | 4b6c1d915dfe |
| children | a3d776a5719b |
| files | src/main.c src/version.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -4025,8 +4025,6 @@ server_to_input_buf(str) /* * Evaluate an expression that the client sent to a string. - * Handles disabling error messages and disables debugging, otherwise Vim - * hangs, waiting for "cont" to be typed. */ char_u * eval_client_expr_to_string(expr) @@ -4036,15 +4034,21 @@ eval_client_expr_to_string(expr) int save_dbl = debug_break_level; int save_ro = redir_off; + /* Disable debugging, otherwise Vim hangs, waiting for "cont" to be + * typed. */ debug_break_level = -1; redir_off = 0; - ++emsg_skip; + /* Do not display error message, otherwise Vim hangs, waiting for "cont" + * to be typed. Do generate errors so that try/catch works. */ + ++emsg_silent; res = eval_to_string(expr, NULL, TRUE); debug_break_level = save_dbl; redir_off = save_ro; - --emsg_skip; + --emsg_silent; + if (emsg_silent < 0) + emsg_silent = 0; /* A client can tell us to redraw, but not to display the cursor, so do * that here. */