aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-03-21 07:21:04 +0800
committerGitHub <noreply@github.com>2022-03-21 07:21:04 +0800
commit18900758c382dcf7b773db1803d146a9ee1d2044 (patch)
tree80b9661d474782102bd10231bb2003c7c4d915cc /src/nvim/eval.c
parente7391191e27768dc6d603f3846d9b4e09c003cb5 (diff)
parent087a9603d05b6210b0503893f16101b044125631 (diff)
downloadrneovim-18900758c382dcf7b773db1803d146a9ee1d2044.tar.gz
rneovim-18900758c382dcf7b773db1803d146a9ee1d2044.tar.bz2
rneovim-18900758c382dcf7b773db1803d146a9ee1d2044.zip
Merge pull request #17760 from lewis6991/vim-patch-8.1.1734
vim-patch:8.1.{1734,1742,1743}: highlight, match and screen.c refactoring
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 33e8469768..7f937a3137 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -68,7 +68,6 @@ static char *e_illvar = N_("E461: Illegal variable name: %s");
static char *e_cannot_mod = N_("E995: Cannot modify existing variable");
static char *e_nowhitespace
= N_("E274: No white space allowed before parenthesis");
-static char *e_invalwindow = N_("E957: Invalid window number");
static char *e_lock_unlock = N_("E940: Cannot lock or unlock variable %s");
static char *e_write2 = N_("E80: Error while writing: %s");
static char *e_string_list_or_blob_required = N_("E1098: String, List or Blob required");
@@ -7323,30 +7322,6 @@ void mapblock_fill_dict(dict_T *const dict, const mapblock_T *const mp, long buf
tv_dict_add_allocated_str(dict, S_LEN("mode"), mapmode);
}
-int matchadd_dict_arg(typval_T *tv, const char **conceal_char, win_T **win)
-{
- dictitem_T *di;
-
- if (tv->v_type != VAR_DICT) {
- emsg(_(e_dictreq));
- return FAIL;
- }
-
- if ((di = tv_dict_find(tv->vval.v_dict, S_LEN("conceal"))) != NULL) {
- *conceal_char = tv_get_string(&di->di_tv);
- }
-
- if ((di = tv_dict_find(tv->vval.v_dict, S_LEN("window"))) != NULL) {
- *win = find_win_by_nr_or_id(&di->di_tv);
- if (*win == NULL) {
- emsg(_(e_invalwindow));
- return FAIL;
- }
- }
-
- return OK;
-}
-
void return_register(int regname, typval_T *rettv)
{
char_u buf[2] = { regname, 0 };