diff options
| author | Wayne Davison <wayned@users.sourceforge.net> | 2005-11-01 02:50:31 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@users.sourceforge.net> | 2005-11-01 02:50:31 +0000 |
| commit | 0d611ed481b4606fa587246f34457d731f449d60 (patch) | |
| tree | a2f80ded90087c4ea8b1fe0c904f64381527b501 /Src/Zle | |
| parent | 8fde3fdf769b930908630b86b5cd83826e67bb3a (diff) | |
| download | zsh-0d611ed481b4606fa587246f34457d731f449d60.tar.gz zsh-0d611ed481b4606fa587246f34457d731f449d60.tar.xz zsh-0d611ed481b4606fa587246f34457d731f449d60.zip | |
- Changed a bunch of iblank() calls on zleline to use ZC_iblank().
- Changed one isalpha() call on zleline to use the new ZC_ialpha().
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/zle_word.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Src/Zle/zle_word.c b/Src/Zle/zle_word.c index f432a46ef..b2db659cd 100644 --- a/Src/Zle/zle_word.c +++ b/Src/Zle/zle_word.c @@ -72,11 +72,11 @@ viforwardword(char **args) while (zlecs != zlell && iident(zleline[zlecs])) zlecs++; else - while (zlecs != zlell && !iident(zleline[zlecs]) && !iblank(zleline[zlecs])) + while (zlecs != zlell && !iident(zleline[zlecs]) && !ZC_iblank(zleline[zlecs])) zlecs++; if (wordflag && !n) return 0; - while (zlecs != zlell && (iblank(zleline[zlecs]) || zleline[zlecs] == '\n')) + while (zlecs != zlell && ZC_inblank(zleline[zlecs])) zlecs++; } return 0; @@ -96,11 +96,11 @@ viforwardblankword(char **args) return ret; } while (n--) { - while (zlecs != zlell && !iblank(zleline[zlecs])) + while (zlecs != zlell && !ZC_iblank(zleline[zlecs])) zlecs++; if (wordflag && !n) return 0; - while (zlecs != zlell && iblank(zleline[zlecs])) + while (zlecs != zlell && ZC_iblank(zleline[zlecs])) zlecs++; } return 0; @@ -139,9 +139,9 @@ viforwardblankwordend(UNUSED(char **args)) if (n < 0) return 1; while (n--) { - while (zlecs != zlell && iblank(zleline[zlecs + 1])) + while (zlecs != zlell && ZC_iblank(zleline[zlecs + 1])) zlecs++; - while (zlecs != zlell && !iblank(zleline[zlecs + 1])) + while (zlecs != zlell && !ZC_iblank(zleline[zlecs + 1])) zlecs++; } if (zlecs != zlell && virangeflag) @@ -163,14 +163,14 @@ viforwardwordend(char **args) return ret; } while (n--) { - if (iblank(zleline[zlecs + 1])) - while (zlecs != zlell && iblank(zleline[zlecs + 1])) + if (ZC_iblank(zleline[zlecs + 1])) + while (zlecs != zlell && ZC_iblank(zleline[zlecs + 1])) zlecs++; if (iident(zleline[zlecs + 1])) while (zlecs != zlell && iident(zleline[zlecs + 1])) zlecs++; else - while (zlecs != zlell && !iident(zleline[zlecs + 1]) && !iblank(zleline[zlecs + 1])) + while (zlecs != zlell && !iident(zleline[zlecs + 1]) && !ZC_iblank(zleline[zlecs + 1])) zlecs++; } if (zlecs != zlell && virangeflag) @@ -214,13 +214,13 @@ vibackwardword(char **args) return ret; } while (n--) { - while (zlecs && iblank(zleline[zlecs - 1])) + while (zlecs && ZC_iblank(zleline[zlecs - 1])) zlecs--; if (iident(zleline[zlecs - 1])) while (zlecs && iident(zleline[zlecs - 1])) zlecs--; else - while (zlecs && !iident(zleline[zlecs - 1]) && !iblank(zleline[zlecs - 1])) + while (zlecs && !iident(zleline[zlecs - 1]) && !ZC_iblank(zleline[zlecs - 1])) zlecs--; } return 0; @@ -240,9 +240,9 @@ vibackwardblankword(char **args) return ret; } while (n--) { - while (zlecs && iblank(zleline[zlecs - 1])) + while (zlecs && ZC_iblank(zleline[zlecs - 1])) zlecs--; - while (zlecs && !iblank(zleline[zlecs - 1])) + while (zlecs && !ZC_iblank(zleline[zlecs - 1])) zlecs--; } return 0; @@ -304,13 +304,13 @@ vibackwardkillword(UNUSED(char **args)) return 1; /* this taken from "vibackwardword" */ while (n--) { - while ((x > lim) && iblank(zleline[x - 1])) + while ((x > lim) && ZC_iblank(zleline[x - 1])) x--; if (iident(zleline[x - 1])) while ((x > lim) && iident(zleline[x - 1])) x--; else - while ((x > lim) && !iident(zleline[x - 1]) && !iblank(zleline[x - 1])) + while ((x > lim) && !iident(zleline[x - 1]) && !ZC_iblank(zleline[x - 1])) x--; } backkill(zlecs - x, 1); @@ -398,7 +398,7 @@ capitalizeword(UNUSED(char **args)) first = 1; while (zlecs != zlell && !ZC_iword(zleline[zlecs])) zlecs++; - while (zlecs != zlell && ZC_iword(zleline[zlecs]) && !isalpha(zleline[zlecs])) + while (zlecs != zlell && ZC_iword(zleline[zlecs]) && !ZC_ialpha(zleline[zlecs])) zlecs++; while (zlecs != zlell && ZC_iword(zleline[zlecs])) { zleline[zlecs] = (first) ? ZC_toupper(zleline[zlecs]) : |