Mercurial > vim
changeset 11179:49fda934f7e8 v8.0.0476
patch 8.0.0476: missing change to main.c
commit https://github.com/vim/vim/commit/7a43cb9cb5909634469b0a3e865747f10ea38e9b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 18 18:15:16 2017 +0100
patch 8.0.0476: missing change to main.c
Problem: Missing change to main.c.
Solution: Add new function.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 18 Mar 2017 18:30:04 +0100 |
| parents | 9b7b3c1eb7ec |
| children | 4152d770f04e |
| files | src/main.c src/version.c |
| diffstat | 2 files changed, 43 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -4140,6 +4140,11 @@ eval_client_expr_to_string(char_u *expr) char_u *res; int save_dbl = debug_break_level; int save_ro = redir_off; + void *fc; + + /* Evaluate the expression at the toplevel, don't use variables local to + * the calling function. */ + fc = clear_current_funccal(); /* Disable debugging, otherwise Vim hangs, waiting for "cont" to be * typed. */ @@ -4156,6 +4161,7 @@ eval_client_expr_to_string(char_u *expr) --emsg_silent; if (emsg_silent < 0) emsg_silent = 0; + restore_current_funccal(fc); /* A client can tell us to redraw, but not to display the cursor, so do * that here. */ @@ -4170,6 +4176,41 @@ eval_client_expr_to_string(char_u *expr) } /* + * Evaluate a command or expression sent to ourselves. + */ + int +sendToLocalVim(char_u *cmd, int asExpr, char_u **result) +{ + if (asExpr) + { + char_u *ret; + + ret = eval_client_expr_to_string(cmd); + if (result != NULL) + { + if (ret == NULL) + { + char *err = _(e_invexprmsg); + size_t len = STRLEN(cmd) + STRLEN(err) + 5; + char_u *msg; + + msg = alloc(len); + if (msg != NULL) + vim_snprintf((char *)msg, len, "%s: \"%s\"", err, cmd); + *result = msg; + } + else + *result = ret; + } + else + vim_free(ret); + return ret == NULL ? -1 : 0; + } + server_to_input_buf(cmd); + return 0; +} + +/* * If conversion is needed, convert "data" from "client_enc" to 'encoding' and * return an allocated string. Otherwise return "data". * "*tofree" is set to the result when it needs to be freed later.