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

updated for version 7.0075

Browse Source
This commit is contained in:
Bram Moolenaar 2005-05-22 22:09:40 +00:00
parent 2389c3c640
commit de934d77b1
4 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/pattern.txt
View File

@ -1,4 +1,4 @@
*pattern.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 *pattern.txt* For Vim version 7.0aa. Last change: 2005 May 22
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -835,8 +835,8 @@ $ At end of pattern or in front of "\|" or "\)" ("|" or ")" after "\v"):
are halfway a Tab or other character that occupies more than one are halfway a Tab or other character that occupies more than one
screen character. {not in Vi} screen character. {not in Vi}
WARNING: When inserting or deleting text Vim does not automatically WARNING: When inserting or deleting text Vim does not automatically
update the matches. This means Syntax highlighting quickly becomes update highlighted matches. This means Syntax highlighting quickly
wrong. becomes wrong.
Example, to highlight the all characters after virtual column 72: > Example, to highlight the all characters after virtual column 72: >
/\%>72v.* /\%>72v.*
< When 'hlsearch' is set and you move the cursor around and make changes < When 'hlsearch' is set and you move the cursor around and make changes

4
src/globals.h
View File

@ -1431,6 +1431,10 @@ EXTERN char_u e_intern2[] INIT(=N_("E685: Internal error: %s"));
EXTERN char_u e_maxmempat[] INIT(=N_("E363: pattern uses more memory than 'maxmempattern'")); EXTERN char_u e_maxmempat[] INIT(=N_("E363: pattern uses more memory than 'maxmempattern'"));
EXTERN char_u e_emptybuf[] INIT(=N_("E749: empty buffer")); EXTERN char_u e_emptybuf[] INIT(=N_("E749: empty buffer"));
#ifdef FEAT_EX_EXTRA
EXTERN char_u e_invalpat[] INIT(=N_("E682: Invalid search pattern or delimiter"));
#endif
#ifdef MACOS_X_UNIX #ifdef MACOS_X_UNIX
EXTERN short disallow_gui INIT(= FALSE); EXTERN short disallow_gui INIT(= FALSE);
#endif #endif

20
src/ops.c
View File

@ -783,6 +783,17 @@ get_expr_line()
vim_free(expr_copy); vim_free(expr_copy);
return rv; return rv;
} }
/*
* Get the '=' register expression itself, without evaluating it.
*/
char_u *
get_expr_line_src()
{
if (expr_line == NULL)
return NULL;
return vim_strsave(expr_line);
}
#endif /* FEAT_EVAL */ #endif /* FEAT_EVAL */
/* /*
@ -5588,9 +5599,10 @@ get_reg_type(regname, reglen)
* Returns NULL for error. * Returns NULL for error.
*/ */
char_u * char_u *
get_reg_contents(regname, allowexpr) get_reg_contents(regname, allowexpr, expr_src)
int regname; int regname;
int allowexpr; /* allow "=" register. */ int allowexpr; /* allow "=" register */
int expr_src; /* get expression for "=" register */
{ {
long i; long i;
char_u *retval; char_u *retval;
@ -5601,7 +5613,11 @@ get_reg_contents(regname, allowexpr)
if (regname == '=') if (regname == '=')
{ {
if (allowexpr) if (allowexpr)
{
if (expr_src)
return get_expr_line_src();
return get_expr_line(); return get_expr_line();
}
return NULL; return NULL;
} }

9
src/testdir/test55.in
View File

@ -266,6 +266,15 @@ STARTTEST
:$put =string(reverse(sort(l))) :$put =string(reverse(sort(l)))
:$put =string(sort(reverse(sort(l)))) :$put =string(sort(reverse(sort(l))))
:" :"
:" splitting a string to a List
:$put =string(split(' aa bb '))
:$put =string(split(' aa bb ', '\W\+', 0))
:$put =string(split(' aa bb ', '\W\+', 1))
:$put =string(split(' aa bb ', '\W', 1))
:$put =string(split(':aa::bb:', ':', 0))
:$put =string(split(':aa::bb:', ':', 1))
:$put =string(split('aa,,bb, cc,', ',\s*', 1))
:"
:endfun :endfun
:call Test(1, 2, [3, 4], {5: 6}) " This may take a while :call Test(1, 2, [3, 4], {5: 6}) " This may take a while
:" :"