diff options
| author | Frank Terbeck <ft@bewatermyfriend.org> | 2011-06-02 10:50:35 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2011-06-02 10:50:35 +0200 |
| commit | 2438a0e95aa448f0aeda468752444306b44fe7d0 (patch) | |
| tree | 8477e9c6af360f6a89af13e8cb5f2a4f9c1cff2c /Src/Zle/zle_move.c | |
| parent | b495ba1e5a3ab1396844490ad8cad17dec23d6c1 (diff) | |
| parent | 21266db1d9ae433bf1dcb196a4e258c00541b599 (diff) | |
| download | zsh-2438a0e95aa448f0aeda468752444306b44fe7d0.tar.gz zsh-2438a0e95aa448f0aeda468752444306b44fe7d0.zip | |
Merge commit 'zsh-4.3.12' into debian
Diffstat (limited to 'Src/Zle/zle_move.c')
| -rw-r--r-- | Src/Zle/zle_move.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c index f15b114f5..0e940bc21 100644 --- a/Src/Zle/zle_move.c +++ b/Src/Zle/zle_move.c @@ -30,7 +30,7 @@ #include "zle.mdh" #include "zle_move.pro" -static int vimarkcs[27], vimarkline[27]; +static int vimarkcs[26], vimarkline[26]; #ifdef MULTIBYTE_SUPPORT /* @@ -536,6 +536,9 @@ vimatchbracket(UNUSED(char **args)) int ocs = zlecs, dir, ct; unsigned char oth, me; + if ((zlecs == zlell || zleline[zlecs] == '\n') && zlecs > 0) + DECCS(); + otog: if (zlecs == zlell || zleline[zlecs] == '\n') { zlecs = ocs; @@ -803,16 +806,11 @@ int vigotomark(UNUSED(char **args)) { ZLE_INT_T ch; - LASTFULLCHAR_T lfc = LASTFULLCHAR; ch = getfullchar(0); - if (ch == lfc) - ch = 26; - else { - if (ch < ZWC('a') || ch > ZWC('z')) - return 1; - ch -= ZWC('a'); - } + if (ch < ZWC('a') || ch > ZWC('z')) + return 1; + ch -= ZWC('a'); if (!vimarkline[ch]) return 1; if (curhist != vimarkline[ch] && !zle_goto_hist(vimarkline[ch], 0, 0)) { |