diff options
Diffstat (limited to 'src/misc1.c')
-rw-r--r-- | src/misc1.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c index 8a2d19e1bd..9558cc5ff8 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2168,7 +2168,7 @@ del_bytes(count, fixpos) #ifdef FEAT_MBYTE /* If 'delcombine' is set and deleting (less than) one character, only * delete the last combining character. */ - if (p_deco && enc_utf8 && (*mb_ptr2len_check)(oldp + col) <= count) + if (p_deco && enc_utf8 && utfc_ptr2len_check(oldp + col) >= count) { int c1, c2; int n; @@ -3321,7 +3321,11 @@ expand_env_esc(src, dst, dstlen, esc) while (*src && dstlen > 0) { copy_char = TRUE; - if (*src == '$' + if ((*src == '$' +#ifdef VMS + && at_start +#endif + ) #if defined(MSDOS) || defined(MSWIN) || defined(OS2) || *src == '%' #endif |