Merge branch 'obsd-master'

2 files changed, 3 insertions, 2 deletions

diff --git a/input.c b/input.c
index 2ff7a65d..d76216f4 100644
--- a/input.c
+++ b/input.c
@@ -923,7 +923,8 @@ input_parse_buffer(struct window_pane *wp, u_char *buf, size_t len)
 		    ictx->ch > itr->last) {
 			itr = ictx->state->transitions;
 			while (itr->first != -1 && itr->last != -1) {
-				if (ictx->ch >= itr->first && ictx->ch <= itr->last)
+				if (ictx->ch >= itr->first &&
+				    ictx->ch <= itr->last)
 					break;
 				itr++;
 			}
diff --git a/window-tree.c b/window-tree.c
index 1ee5e7d4..9909036c 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -269,7 +269,7 @@ window_tree_cmp_pane(const void *a0, const void *b0)
 		result = (*a)->id - (*b)->id;
 	}
 	if (window_tree_sort->reversed)
-		result *= -1;
+		result = -result;
 	return (result);
 }