updated for version 7.0038

This commit is contained in:
Bram Moolenaar
2005-01-14 21:48:43 +00:00
parent fd371684fa
commit d8b0273231
11 changed files with 247 additions and 58 deletions

View File

@ -2407,6 +2407,21 @@ utf_head_off(base, p)
return (int)(p - q);
}
/*
* Copy a character from "*fp" to "*tp" and advance the pointers.
*/
void
mb_copy_char(fp, tp)
char_u **fp;
char_u **tp;
{
int l = (*mb_ptr2len_check)(*fp);
mch_memmove(*tp, *fp, (size_t)l);
*tp += l;
*fp += l;
}
/*
* Return the offset from "p" to the first byte of a character. When "p" is
* at the start of a character 0 is returned, otherwise the offset to the next

View File

@ -4724,7 +4724,7 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
else
buf = vim_strsave(*pat);
expl_files = NULL;
has_wildcard = mch_has_exp_wildcard(buf); /* (still) wildcards in there? */
has_wildcard = mch_has_exp_wildcard(buf); /* (still) wildcards? */
if (has_wildcard) /* yes, so expand them */
expl_files = (char_u **)_fnexplode(buf);
@ -5226,12 +5226,20 @@ save_patterns(num_pat, pat, num_file, file)
char_u ***file;
{
int i;
char_u *s;
*file = (char_u **)alloc(num_pat * sizeof(char_u *));
if (*file == NULL)
return FAIL;
for (i = 0; i < num_pat; i++)
(*file)[i] = vim_strsave(pat[i]);
{
s = vim_strsave(pat[i]);
if (s != NULL)
/* Be compatible with expand_filename(): halve the number of
* backslashes. */
backslash_halve(s);
(*file)[i] = s;
}
*num_file = num_pat;
return OK;
}

View File

@ -45,6 +45,7 @@ int latin_head_off __ARGS((char_u *base, char_u *p));
int dbcs_head_off __ARGS((char_u *base, char_u *p));
int dbcs_screen_head_off __ARGS((char_u *base, char_u *p));
int utf_head_off __ARGS((char_u *base, char_u *p));
void mb_copy_char __ARGS((char_u **fp, char_u **tp));
int mb_off_next __ARGS((char_u *base, char_u *p));
int mb_tail_off __ARGS((char_u *base, char_u *p));
int utf_valid_string __ARGS((char_u *s, char_u *end));

View File

@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 11)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 11, compiled "
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 14)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 14, compiled "