diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-11-13 16:06:11 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-11-13 16:06:11 +0000 |
| commit | 1016f112bfa3d626c54db20c7cbd0814e90e174c (patch) | |
| tree | 1f2d9f25b7a2af2b2e10499c11996fbf154e021b | |
| parent | b7397bf413643768a44a79d9a32fb887b9a80cde (diff) | |
| parent | 45a10dde95ae70bb7968679a35ad3bb3e4f6dd9d (diff) | |
| download | rtmux-1016f112bfa3d626c54db20c7cbd0814e90e174c.tar.gz rtmux-1016f112bfa3d626c54db20c7cbd0814e90e174c.tar.bz2 rtmux-1016f112bfa3d626c54db20c7cbd0814e90e174c.zip | |
Merge branch 'master' of github.com:tmux/tmux
| -rw-r--r-- | format.c | 3 | ||||
| -rw-r--r-- | grid-view.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -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) { |