aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.0089

Browse Source
This commit is contained in:
Bram Moolenaar
2005-06-21 22:37:39 +00:00
parent 3f77047607
commit d857f0e0f4
54 changed files with 2760 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/normal.c
View File

@@ -81,9 +81,6 @@ static void nv_ctrlo __ARGS((cmdarg_T *cap));
static void nv_hat __ARGS((cmdarg_T *cap));
static void nv_Zet __ARGS((cmdarg_T *cap));
static void nv_ident __ARGS((cmdarg_T *cap));
#ifdef FEAT_VISUAL
static int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
#endif
static void nv_tagpop __ARGS((cmdarg_T *cap));
static void nv_scroll __ARGS((cmdarg_T *cap));
static void nv_right __ARGS((cmdarg_T *cap));
@@ -5167,12 +5164,12 @@ nv_ident(cap)
vim_free(buf);
}
#ifdef FEAT_VISUAL
#if defined(FEAT_VISUAL) || defined(PROTO)
/*
* Get visually selected text, within one line only.
* Returns FAIL if more than one line selected.
*/
static int
int
get_visual_text(cap, pp, lenp)
cmdarg_T *cap;
char_u **pp; /* return: start of selected text */
@@ -5182,7 +5179,8 @@ get_visual_text(cap, pp, lenp)
unadjust_for_sel();
if (VIsual.lnum != curwin->w_cursor.lnum)
{
clearopbeep(cap->oap);
if (cap != NULL)
clearopbeep(cap->oap);
return FAIL;
}
if (VIsual_mode == 'V')
@@ -5592,24 +5590,7 @@ nv_gotofile(cap)
}
#endif
# ifdef FEAT_VISUAL
/*
* In Visual mode, use the selected text as a file name.
* Don't allow selection across multiple lines.
*/
if (VIsual_active)
{
int len;
if (get_visual_text(cap, &ptr, &len) == FAIL)
return;
ptr = find_file_name_in_path(ptr, len,
FNAME_MESS|FNAME_EXP|FNAME_REL, cap->count1, curbuf->b_ffname);
}
else
# endif
ptr = file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL,
cap->count1);
ptr = grab_file_name(cap->count1);
if (ptr != NULL)
{