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

patch 8.2.0149: maintaining a Vim9 branch separately is more work

Browse Source 
Problem:    Maintaining a Vim9 branch separately is more work.
Solution:   Merge the Vim9 script changes.
This commit is contained in:
Bram Moolenaar
2020-01-26 15:56:19 +01:00
parent 1d9215b9aa
commit 8a7d6542b3
65 changed files with 11777 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/misc1.c
View File

@@ -2067,13 +2067,17 @@ match_user(char_u *name)
concat_str(char_u *str1, char_u *str2)
{
char_u *dest;
size_t l = STRLEN(str1);
size_t l = str1 == NULL ? 0 : STRLEN(str1);
dest = alloc(l + STRLEN(str2) + 1L);
dest = alloc(l + (str2 == NULL ? 0 : STRLEN(str2)) + 1L);
if (dest != NULL)
{
STRCPY(dest, str1);
STRCPY(dest + l, str2);
if (str1 == NULL)
*dest = NUL;
else
STRCPY(dest, str1);
if (str2 != NULL)
STRCPY(dest + l, str2);
}
return dest;
}