diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-11-18 10:14:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-11-18 10:14:35 +0000 |
| commit | 1e9b85e586a24ae119e4f41504ea2e71e4dd5de7 (patch) | |
| tree | 092d6a6832f2fa9feb3c5a7cb8ffcfb7392e44ad /Src | |
| parent | 14231691e15744c0aac39224e9aa0d84835313fe (diff) | |
| download | zsh-1e9b85e586a24ae119e4f41504ea2e71e4dd5de7.tar.gz zsh-1e9b85e586a24ae119e4f41504ea2e71e4dd5de7.tar.xz zsh-1e9b85e586a24ae119e4f41504ea2e71e4dd5de7.zip | |
François Revol: some BeOS fixes
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Modules/zpty.c | 3 | ||||
| -rw-r--r-- | Src/Zle/zle_refresh.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c index 6c332b270..d115afcef 100644 --- a/Src/Modules/zpty.c +++ b/Src/Modules/zpty.c @@ -260,6 +260,9 @@ get_pty(int master, int *retfd) if (master) { strcpy(name, "/dev/ptyxx"); +#if defined(__BEOS__) || defined(__HAIKU__) + name[7] = '/'; +#endif for (p1 = char1; *p1; p1++) { name[8] = *p1; diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index 6a50d8b99..ba6fdaaf1 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -1879,6 +1879,8 @@ refreshline(int ln) /* 3: main display loop - write out the buffer using whatever tricks we can */ for (;;) { + int now_off; + #ifdef MULTIBYTE_SUPPORT if ((!nl->chr || nl->chr != WEOF) && (!ol->chr || ol->chr != WEOF)) { #endif @@ -2050,7 +2052,7 @@ refreshline(int ln) * If an attribute was on here but isn't any more, * output the sequence to turn it off. */ - int now_off = ol->atr & ~nl->atr & TXT_ATTR_ON_MASK; + now_off = ol->atr & ~nl->atr & TXT_ATTR_ON_MASK; if (now_off) settextattributes(TXT_ATTR_OFF_FROM_ON(now_off)); |