diff options
| -rw-r--r-- | format.c | 2 | ||||
| -rw-r--r-- | server-client.c | 5 | ||||
| -rw-r--r-- | window-buffer.c | 2 | ||||
| -rw-r--r-- | window-client.c | 1 |
4 files changed, 7 insertions, 3 deletions
@@ -528,7 +528,7 @@ format_cb_current_command(struct format_tree *ft, struct format_entry *fe) } /* Callback for pane_current_path. */ -void +static void format_cb_current_path(struct format_tree *ft, struct format_entry *fe) { struct window_pane *wp = ft->wp; diff --git a/server-client.c b/server-client.c index aaedebcf..08200529 100644 --- a/server-client.c +++ b/server-client.c @@ -1066,6 +1066,9 @@ server_client_resize_force(struct window_pane *wp) ws.ws_col = wp->sx; ws.ws_row = wp->sy - 1; if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) +#ifdef __sun + if (errno != EINVAL && errno != ENXIO) +#endif fatal("ioctl failed"); log_debug("%s: %%%u forcing resize", __func__, wp->id); @@ -1091,6 +1094,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data) memset(&ws, 0, sizeof ws); ws.ws_col = wp->sx; ws.ws_row = wp->sy; + if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) #ifdef __sun /* * Some versions of Solaris apparently can return an error when @@ -1101,7 +1105,6 @@ server_client_resize_event(__unused int fd, __unused short events, void *data) if (errno != EINVAL && errno != ENXIO) #endif fatal("ioctl failed"); - } wp->flags &= ~PANE_RESIZE; diff --git a/window-buffer.c b/window-buffer.c index f4d4c5f8..4a6581ba 100644 --- a/window-buffer.c +++ b/window-buffer.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <vis.h> +#include <time.h> #include "tmux.h" diff --git a/window-client.c b/window-client.c index 4d720960..f34d007d 100644 --- a/window-client.c +++ b/window-client.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> +#include <time.h> #include "tmux.h" |