diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2015-04-25 13:34:30 -0300 |
|---|---|---|
| committer | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2015-04-25 13:37:44 -0300 |
| commit | 0bce4dc54427d05ab320a88f6269a9c1b05ea899 (patch) | |
| tree | 4a3aff2749eb0b70b7947ecfc7cd56d56ad4e29d /src/nvim/mark.c | |
| parent | d350d12a00518aa0d9e3a1d49c6815c3398d882f (diff) | |
| parent | c96b933acc4d9ec7382d451055e44c85959772b9 (diff) | |
| download | rneovim-0bce4dc54427d05ab320a88f6269a9c1b05ea899.tar.gz rneovim-0bce4dc54427d05ab320a88f6269a9c1b05ea899.tar.bz2 rneovim-0bce4dc54427d05ab320a88f6269a9c1b05ea899.zip | |
Merge #2486: Replacements for vim_iswhite, VIM_ISDIGIT, vim_isdigit, vim_isxdigit, and vim_isspace
Reviewed-by: Michael Reed <m.reed@mykolab.com>
Diffstat (limited to 'src/nvim/mark.c')
| -rw-r--r-- | src/nvim/mark.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c index a142d12c13..ce44149ffa 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -358,8 +358,8 @@ pos_T *getmark_buf_fnum(buf_T *buf, int c, int changefile, int *fnum) } } else if (ASCII_ISLOWER(c)) { /* normal named mark */ posp = &(buf->b_namedm[c - 'a']); - } else if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c)) { /* named file mark */ - if (VIM_ISDIGIT(c)) + } else if (ASCII_ISUPPER(c) || ascii_isdigit(c)) { /* named file mark */ + if (ascii_isdigit(c)) c = c - '0' + NMARKS; else c -= 'A'; @@ -708,14 +708,14 @@ void ex_delmarks(exarg_T *eap) /* clear specified marks only */ for (p = eap->arg; *p != NUL; ++p) { lower = ASCII_ISLOWER(*p); - digit = VIM_ISDIGIT(*p); + digit = ascii_isdigit(*p); if (lower || digit || ASCII_ISUPPER(*p)) { if (p[1] == '-') { /* clear range of marks */ from = *p; to = p[2]; if (!(lower ? ASCII_ISLOWER(p[2]) - : (digit ? VIM_ISDIGIT(p[2]) + : (digit ? ascii_isdigit(p[2]) : ASCII_ISUPPER(p[2]))) || to < from) { EMSG2(_(e_invarg2), p); @@ -1183,7 +1183,7 @@ int read_viminfo_filemark(vir_T *virp, int force) str = virp->vir_line + 1; if ( *str <= 127 && - ((*virp->vir_line == '\'' && (VIM_ISDIGIT(*str) || isupper(*str))) + ((*virp->vir_line == '\'' && (ascii_isdigit(*str) || isupper(*str))) || (*virp->vir_line == '-' && *str == '\''))) { if (*str == '\'') { /* If the jumplist isn't full insert fmark as oldest entry */ @@ -1198,7 +1198,7 @@ int read_viminfo_filemark(vir_T *virp, int force) fm->fmark.mark.lnum = 0; fm->fname = NULL; } - } else if (VIM_ISDIGIT(*str)) + } else if (ascii_isdigit(*str)) fm = &namedfm[*str - '0' + NMARKS]; else { // is uppercase assert(*str >= 'A' && *str <= 'Z'); @@ -1430,7 +1430,7 @@ void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags str = skipwhite(line + 1); str = viminfo_readstring(virp, (int)(str - virp->vir_line), FALSE); p = str + STRLEN(str); - while (p != str && (*p == NUL || vim_isspace(*p))) + while (p != str && (*p == NUL || ascii_isspace(*p))) p--; if (*p) p++; |