diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-01-05 12:35:21 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-01-05 12:35:21 +0000 |
| commit | 8af1fbf979e13e5e7a883f5f66d8582c4967c7b9 (patch) | |
| tree | 63d4d05df39edf6d7982ae8623d4e84179e4aecc /src | |
| parent | b52e532abe5755bde5a65b8d7a853d32e6bcd537 (diff) | |
| download | vim-git-8af1fbf979e13e5e7a883f5f66d8582c4967c7b9.tar.gz | |
updated for version 7.1-205v7.1.205
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 1 | ||||
| -rw-r--r-- | src/normal.c | 31 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 3 |
4 files changed, 36 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 8f6fcf37c..aff284e0d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -345,6 +345,7 @@ static struct vimvar {VV_NAME("mouse_win", VAR_NUMBER), 0}, {VV_NAME("mouse_lnum", VAR_NUMBER), 0}, {VV_NAME("mouse_col", VAR_NUMBER), 0}, + {VV_NAME("operator", VAR_STRING), VV_RO}, }; /* shorthand */ diff --git a/src/normal.c b/src/normal.c index f5b76514b..f2c008982 100644 --- a/src/normal.c +++ b/src/normal.c @@ -141,6 +141,9 @@ static void nv_redo __ARGS((cmdarg_T *cap)); static void nv_Undo __ARGS((cmdarg_T *cap)); static void nv_tilde __ARGS((cmdarg_T *cap)); static void nv_operator __ARGS((cmdarg_T *cap)); +#ifdef FEAT_EVAL +static void set_op_var __ARGS((int optype)); +#endif static void nv_lineop __ARGS((cmdarg_T *cap)); static void nv_home __ARGS((cmdarg_T *cap)); static void nv_pipe __ARGS((cmdarg_T *cap)); @@ -7180,6 +7183,9 @@ nv_optrans(cap) { cap->oap->start = curwin->w_cursor; cap->oap->op_type = OP_DELETE; +#ifdef FEAT_EVAL + set_op_var(OP_DELETE); +#endif cap->count1 = 1; nv_dollar(cap); finish_op = TRUE; @@ -8219,8 +8225,33 @@ nv_operator(cap) { cap->oap->start = curwin->w_cursor; cap->oap->op_type = op_type; +#ifdef FEAT_EVAL + set_op_var(op_type); +#endif + } +} + +#ifdef FEAT_EVAL +/* + * Set v:operator to the characters for "optype". + */ + static void +set_op_var(optype) + int optype; +{ + char_u opchars[3]; + + if (optype == OP_NOP) + set_vim_var_string(VV_OP, NULL, 0); + else + { + opchars[0] = get_op_char(optype); + opchars[1] = get_extra_op_char(optype); + opchars[2] = NUL; + set_vim_var_string(VV_OP, opchars, -1); } } +#endif /* * Handle linewise operator "dd", "yy", etc. diff --git a/src/version.c b/src/version.c index f9ad029a7..c9508b969 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 205, +/**/ 204, /**/ 203, @@ -1688,7 +1688,8 @@ int vim_memcmp __ARGS((void *, void *, size_t)); #define VV_MOUSE_WIN 49 #define VV_MOUSE_LNUM 50 #define VV_MOUSE_COL 51 -#define VV_LEN 52 /* number of v: vars */ +#define VV_OP 52 +#define VV_LEN 53 /* number of v: vars */ #ifdef FEAT_CLIPBOARD |