thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1090: cannot get the text under the cursor like v:beval_text

Browse Source 
Problem:    cannot get the text under the cursor like v:beval_text
Solution:   Add <cexpr>.
This commit is contained in:
Bram Moolenaar
2017-09-10 18:16:20 +02:00
parent c168bd4bd3
commit 65f084749b
4 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ex_docmd.c
View File

@@ -10650,31 +10650,33 @@ find_cmdline_var(char_u *src, int *usedlen)
"%",
#define SPEC_PERC 0
"#",
#define SPEC_HASH 1
#define SPEC_HASH (SPEC_PERC + 1)
"<cword>", /* cursor word */
#define SPEC_CWORD 2
#define SPEC_CWORD (SPEC_HASH + 1)
"<cWORD>", /* cursor WORD */
#define SPEC_CCWORD 3
#define SPEC_CCWORD (SPEC_CWORD + 1)
"<cexpr>", /* expr under cursor */
#define SPEC_CEXPR (SPEC_CCWORD + 1)
"<cfile>", /* cursor path name */
#define SPEC_CFILE 4
#define SPEC_CFILE (SPEC_CEXPR + 1)
"<sfile>", /* ":so" file name */
#define SPEC_SFILE 5
#define SPEC_SFILE (SPEC_CFILE + 1)
"<slnum>", /* ":so" file line number */
#define SPEC_SLNUM 6
#define SPEC_SLNUM (SPEC_SFILE + 1)
#ifdef FEAT_AUTOCMD
"<afile>", /* autocommand file name */
# define SPEC_AFILE 7
# define SPEC_AFILE (SPEC_SLNUM + 1)
"<abuf>", /* autocommand buffer number */
# define SPEC_ABUF 8
# define SPEC_ABUF (SPEC_AFILE + 1)
"<amatch>", /* autocommand match name */
# define SPEC_AMATCH 9
# define SPEC_AMATCH (SPEC_ABUF + 1)
#endif
#ifdef FEAT_CLIENTSERVER
"<client>"
# ifdef FEAT_AUTOCMD
# define SPEC_CLIENT 10
# define SPEC_CLIENT (SPEC_AMATCH + 1)
# else
# define SPEC_CLIENT 7
# define SPEC_CLIENT (SPEC_SLNUM + 1)
# endif
#endif
};
@@ -10762,10 +10764,13 @@ eval_vars(
/*
* word or WORD under cursor
*/
if (spec_idx == SPEC_CWORD || spec_idx == SPEC_CCWORD)
if (spec_idx == SPEC_CWORD || spec_idx == SPEC_CCWORD
|| spec_idx == SPEC_CEXPR)
{
resultlen = find_ident_under_cursor(&result, spec_idx == SPEC_CWORD ?
(FIND_IDENT|FIND_STRING) : FIND_STRING);
resultlen = find_ident_under_cursor(&result,
spec_idx == SPEC_CWORD ? (FIND_IDENT | FIND_STRING)
: spec_idx == SPEC_CEXPR ? (FIND_IDENT | FIND_STRING | FIND_EVAL)
: FIND_STRING);
if (resultlen == 0)
{
*errormsg = (char_u *)"";