aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-11-13 14:01:10 +0000
committerThomas Adam <thomas@xteddy.org>2015-11-13 14:01:10 +0000
commit45a10dde95ae70bb7968679a35ad3bb3e4f6dd9d (patch)
tree04ff5252f28e56a5bcdda81fca4df7a2117c2945
parente2917b2627f1aa07a8e1e1b7510452e87c9ecbe3 (diff)
parent88aa1c8dc3962380da8258b3be8fef63b2a2fff2 (diff)
downloadrtmux-45a10dde95ae70bb7968679a35ad3bb3e4f6dd9d.tar.gz
rtmux-45a10dde95ae70bb7968679a35ad3bb3e4f6dd9d.tar.bz2
rtmux-45a10dde95ae70bb7968679a35ad3bb3e4f6dd9d.zip
Merge branch 'obsd-master'
-rw-r--r--format.c3
-rw-r--r--grid-view.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/format.c b/format.c
index 9051afd4..28c01a49 100644
--- a/format.c
+++ b/format.c
@@ -49,7 +49,8 @@ void format_cb_host_short(struct format_tree *, struct format_entry *);
void format_cb_pid(struct format_tree *, struct format_entry *);
void format_cb_session_alerts(struct format_tree *, struct format_entry *);
void format_cb_window_layout(struct format_tree *, struct format_entry *);
-void format_cb_window_visible_layout(struct format_tree *, struct format_entry *);
+void format_cb_window_visible_layout(struct format_tree *,
+ struct format_entry *);
void format_cb_start_command(struct format_tree *, struct format_entry *);
void format_cb_current_command(struct format_tree *, struct format_entry *);
void format_cb_current_path(struct format_tree *, struct format_entry *);
diff --git a/grid-view.c b/grid-view.c
index 5edcfd53..f6708c89 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -30,7 +30,7 @@
#define grid_view_x(gd, x) (x)
#define grid_view_y(gd, y) ((gd)->hsize + (y))
-/* Get cel. */
+/* Get cell. */
void
grid_view_get_cell(struct grid *gd, u_int px, u_int py, struct grid_cell *gc)
{