diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-27 13:37:14 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-27 13:37:14 -0700 |
| commit | 964c7e6f3be262ac4c6b0285edcd4a685fb5bc97 (patch) | |
| tree | eab4cd83357714a23ff86bfaff853929359f832d /fallback.cpp | |
| parent | 630b0515ad494225c8c8532670ffd3d1e2359140 (diff) | |
| parent | cf766b55cca979745f6c218d78f9cdcc297b3f20 (diff) | |
Merge branch 'master' into ast
Conflicts:
complete.cpp
Diffstat (limited to 'fallback.cpp')
| -rw-r--r-- | fallback.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fallback.cpp b/fallback.cpp index 5e4b3e1b..d26907e2 100644 --- a/fallback.cpp +++ b/fallback.cpp @@ -98,8 +98,6 @@ char *tparm_solaris_kludge(char *str, ...) || (enter_reverse_mode && ! strcmp(str, enter_reverse_mode)) || (enter_shadow_mode && ! strcmp(str, enter_shadow_mode)) || (exit_shadow_mode && ! strcmp(str, exit_shadow_mode)) - || (enter_standout_mode && ! strcmp(str, enter_standout_mode)) - || (exit_standout_mode && ! strcmp(str, exit_standout_mode)) || (enter_secure_mode && ! strcmp(str, enter_secure_mode)) || (enter_bold_mode && ! strcmp(str, enter_bold_mode))) { @@ -1508,7 +1506,7 @@ static int mk_wcswidth(const wchar_t *pwcs, size_t n) { if (pwcs[i] == L'\0') break; - + int w = mk_wcwidth(pwcs[i]); if (w < 0) { |