averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master'

Browse Source
This commit is contained in:
Kazuki Sakamoto
2016-08-17 20:54:19 -07:00
parent 7f4c26a9eb bfd096d020
commit fa52c6497a
14 changed files with 95 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+1
View File
@@ -2131,6 +2131,7 @@ test_arglist \
test_set \
test_signs \
test_sort \
test_source_utf8 \
test_startup \
test_startup_utf8 \
test_stat \
src/eval.c
+3 -3
View File
@@ -4087,11 +4087,11 @@ eval6(
{
#ifdef FEAT_NUM64
if (n1 == 0)
n1 = -0x7fffffffffffffff - 1; /* similar to NaN */
n1 = -0x7fffffffffffffffLL - 1; /* similar to NaN */
else if (n1 < 0)
n1 = -0x7fffffffffffffff;
n1 = -0x7fffffffffffffffLL;
else
n1 = 0x7fffffffffffffff;
n1 = 0x7fffffffffffffffLL;
#else
if (n1 == 0)
n1 = -0x7fffffffL - 1L; /* similar to NaN */
src/evalfunc.c
+7 -7
View File
@@ -3291,10 +3291,10 @@ f_float2nr(typval_T *argvars, typval_T *rettv)
if (get_float_arg(argvars, &f) == OK)
{
# ifdef FEAT_NUM64
if (f < -0x7fffffffffffffff)
rettv->vval.v_number = -0x7fffffffffffffff;
else if (f > 0x7fffffffffffffff)
rettv->vval.v_number = 0x7fffffffffffffff;
if (f < -0x7fffffffffffffffLL)
rettv->vval.v_number = -0x7fffffffffffffffLL;
else if (f > 0x7fffffffffffffffLL)
rettv->vval.v_number = 0x7fffffffffffffffLL;
else
rettv->vval.v_number = (varnumber_T)f;
# else
@@ -11193,7 +11193,7 @@ f_strgetchar(typval_T *argvars, typval_T *rettv)
break;
}
--charidx;
byteidx += mb_cptr2len(str + byteidx);
byteidx += MB_CPTR2LEN(str + byteidx);
}
}
#else
@@ -11353,7 +11353,7 @@ f_strcharpart(typval_T *argvars, typval_T *rettv)
if (nchar > 0)
while (nchar > 0 && nbyte < slen)
{
nbyte += mb_cptr2len(p + nbyte);
nbyte += MB_CPTR2LEN(p + nbyte);
--nchar;
}
else
@@ -11368,7 +11368,7 @@ f_strcharpart(typval_T *argvars, typval_T *rettv)
if (off < 0)
len += 1;
else
len += mb_cptr2len(p + off);
len += MB_CPTR2LEN(p + off);
--charlen;
}
}
src/ex_cmds.c
+5
View File
@@ -7861,6 +7861,11 @@ ex_sign(exarg_T *eap)
{ /* ... not currently in a window */
char_u *cmd;
if (buf->b_fname == NULL)
{
EMSG(_("E934: Cannot jump to a buffer that does not have a name"));
return;
}
cmd = alloc((unsigned)STRLEN(buf->b_fname) + 25);
if (cmd == NULL)
return;
src/getchar.c
+12 -16
View File
@@ -4658,8 +4658,16 @@ vim_strsave_escape_csi(
char_u *res;
char_u *s, *d;
/* Need a buffer to hold up to three times as much. */
res = alloc((unsigned)(STRLEN(p) * 3) + 1);
/* Need a buffer to hold up to three times as much. Four in case of an
* illegal utf-8 byte:
* 0xc0 -> 0xc3 0x80 -> 0xc3 K_SPECIAL KS_SPECIAL KE_FILLER */
res = alloc((unsigned)(STRLEN(p) *
#ifdef FEAT_MBYTE
4
#else
3
#endif
) + 1);
if (res != NULL)
{
d = res;
@@ -4674,22 +4682,10 @@ vim_strsave_escape_csi(
}
else
{
#ifdef FEAT_MBYTE
int len = mb_char2len(PTR2CHAR(s));
int len2 = mb_ptr2len(s);
#endif
/* Add character, possibly multi-byte to destination, escaping
* CSI and K_SPECIAL. */
* CSI and K_SPECIAL. Be careful, it can be an illegal byte! */
d = add_char2buf(PTR2CHAR(s), d);
#ifdef FEAT_MBYTE
while (len < len2)
{
/* add following combining char */
d = add_char2buf(PTR2CHAR(s + len), d);
len += mb_char2len(PTR2CHAR(s + len));
}
#endif
mb_ptr_adv(s);
s += MB_CPTR2LEN(s);
}
}
*d = NUL;
src/macros.h
+2 -1
View File
@@ -274,7 +274,7 @@
/* Backup multi-byte pointer. Only use with "p" > "s" ! */
# define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1
/* get length of multi-byte char, not including composing chars */
# define mb_cptr2len(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
# define MB_CPTR2LEN(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
# define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
# define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
@@ -282,6 +282,7 @@
# define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : (int)*(p))
#else
# define MB_PTR2LEN(p) 1
# define MB_CPTR2LEN(p) 1
# define mb_ptr_adv(p) ++p
# define mb_cptr_adv(p) ++p
# define mb_ptr_back(s, p) --p
src/os_unix.c
+1 -1
View File
@@ -4824,7 +4824,7 @@ mch_call_shell(
* round. */
for (p = buffer; p < buffer + len; p += l)
{
l = mb_cptr2len(p);
l = MB_CPTR2LEN(p);
if (l == 0)
l = 1; /* NUL byte? */
else if (MB_BYTE2LEN(*p) != l)
src/os_win32.c
+1 -1
View File
@@ -4370,7 +4370,7 @@ dump_pipe(int options,
* round. */
for (p = buffer; p < buffer + len; p += l)
{
l = mb_cptr2len(p);
l = MB_CPTR2LEN(p);
if (l == 0)
l = 1; /* NUL byte? */
else if (MB_BYTE2LEN(*p) != l)
src/spell.c
+11 -11
View File
@@ -5379,7 +5379,7 @@ suggest_trie_walk(
#ifdef FEAT_MBYTE
if (has_mbyte)
{
n = mb_cptr2len(p);
n = MB_CPTR2LEN(p);
c = mb_ptr2char(p);
if (p[n] == NUL)
c2 = NUL;
@@ -5477,9 +5477,9 @@ suggest_trie_walk(
#ifdef FEAT_MBYTE
if (has_mbyte)
{
n = mb_cptr2len(p);
n = MB_CPTR2LEN(p);
c = mb_ptr2char(p);
fl = mb_cptr2len(p + n);
fl = MB_CPTR2LEN(p + n);
c2 = mb_ptr2char(p + n);
if (!soundfold && !spell_iswordp(p + n + fl, curwin))
c3 = c; /* don't swap non-word char */
@@ -5596,10 +5596,10 @@ suggest_trie_walk(
#ifdef FEAT_MBYTE
if (has_mbyte)
{
n = mb_cptr2len(p);
n = MB_CPTR2LEN(p);
c = mb_ptr2char(p);
fl = mb_cptr2len(p + n);
fl += mb_cptr2len(p + n + fl);
fl = MB_CPTR2LEN(p + n);
fl += MB_CPTR2LEN(p + n + fl);
mch_memmove(p, p + n, fl);
mb_char2bytes(c, p + fl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl;
@@ -5661,10 +5661,10 @@ suggest_trie_walk(
#ifdef FEAT_MBYTE
if (has_mbyte)
{
n = mb_cptr2len(p);
n += mb_cptr2len(p + n);
n = MB_CPTR2LEN(p);
n += MB_CPTR2LEN(p + n);
c = mb_ptr2char(p + n);
tl = mb_cptr2len(p + n);
tl = MB_CPTR2LEN(p + n);
mch_memmove(p + tl, p, n);
mb_char2bytes(c, p);
stack[depth].ts_fidxtry = sp->ts_fidx + n + tl;
@@ -5955,8 +5955,8 @@ find_keepcap_word(slang_T *slang, char_u *fword, char_u *kword)
#ifdef FEAT_MBYTE
if (has_mbyte)
{
flen = mb_cptr2len(fword + fwordidx[depth]);
ulen = mb_cptr2len(uword + uwordidx[depth]);
flen = MB_CPTR2LEN(fword + fwordidx[depth]);
ulen = MB_CPTR2LEN(uword + uwordidx[depth]);
}
else
#endif
src/testdir/test_alot_utf8.vim
+1
View File
@@ -8,3 +8,4 @@
source test_expr_utf8.vim
source test_matchadd_conceal_utf8.vim
source test_regexp_utf8.vim
source test_source_utf8.vim
src/testdir/test_regexp_utf8.vim
-15
View File
@@ -92,18 +92,3 @@ func Test_classes_re2()
call s:classes_test()
set re=0
endfunc
func Test_source_utf8()
" check that sourcing a script with 0x80 as second byte works
new
call setline(1, [':%s/àx/--à1234--/g', ':%s/Àx/--À1234--/g'])
write! Xscript
bwipe!
new
call setline(1, [' àx ', ' Àx '])
source! Xscript | echo
call assert_equal(' --à1234-- ', getline(1))
call assert_equal(' --À1234-- ', getline(2))
bwipe!
call delete('Xscript')
endfunc
src/testdir/test_signs.vim
+12
View File
@@ -181,3 +181,15 @@ func Test_sign_invalid_commands()
call assert_fails('sign place 1 buffer=', 'E158:')
call assert_fails('sign define Sign2 text=', 'E239:')
endfunc
func Test_sign_delete_buffer()
new
sign define Sign text=x
let bufnr = bufnr('%')
new
exe 'bd ' . bufnr
exe 'sign place 61 line=3 name=Sign buffer=' . bufnr
call assert_fails('sign jump 61 buffer=' . bufnr, 'E934:')
sign unplace 61
sign undefine Sign
endfunc
src/testdir/test_source_utf8.vim
+33
View File
@@ -0,0 +1,33 @@
" Test the :source! command
if !has('multi_byte')
finish
endif
func Test_source_utf8()
" check that sourcing a script with 0x80 as second byte works
new
call setline(1, [':%s/àx/--à1234--/g', ':%s/Àx/--À1234--/g'])
write! Xscript
bwipe!
new
call setline(1, [' àx ', ' Àx '])
source! Xscript | echo
call assert_equal(' --à1234-- ', getline(1))
call assert_equal(' --À1234-- ', getline(2))
bwipe!
call delete('Xscript')
endfunc
func Test_source_latin()
" check that sourcing a latin1 script with a 0xc0 byte works
new
call setline(1, ["call feedkeys('r')", "call feedkeys('\xc0', 'xt')"])
write! Xscript
bwipe!
new
call setline(1, ['xxx'])
source Xscript
call assert_equal("\u00c0xx", getline(1))
bwipe!
call delete('Xscript')
endfunc
src/version.c
+6
View File
@@ -778,6 +778,12 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2225,
/**/
2224,
/**/
2223,
/**/
2222,
/**/