aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-21 09:37:06 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-21 09:37:06 +0000
commit8e3767e3441fc8b3c8d60c6dfcb0d313a89feecb (patch)
treeab566ee073b6afcf93e0b108f5c4bd8ff079e5fb /tmux.h
parentc577b47cd5371a95a2656e0ee9c933313121714d (diff)
parentb8b5631d9d11ce786bdb049b9d5aa71b4582a93f (diff)
downloadrtmux-8e3767e3441fc8b3c8d60c6dfcb0d313a89feecb.tar.gz
rtmux-8e3767e3441fc8b3c8d60c6dfcb0d313a89feecb.tar.bz2
rtmux-8e3767e3441fc8b3c8d60c6dfcb0d313a89feecb.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index 8772175a..4fd62d30 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1969,6 +1969,7 @@ void grid_scroll_history(struct grid *);
void grid_scroll_history_region(struct grid *, u_int, u_int);
void grid_expand_line(struct grid *, u_int, u_int);
const struct grid_cell *grid_peek_cell(struct grid *, u_int, u_int);
+const struct grid_line *grid_peek_line(struct grid *, u_int);
struct grid_cell *grid_get_cell(struct grid *, u_int, u_int);
void grid_set_cell(struct grid *, u_int, u_int, const struct grid_cell *);
void grid_clear(struct grid *, u_int, u_int, u_int, u_int);
@@ -1976,7 +1977,7 @@ void grid_clear_lines(struct grid *, u_int, u_int);
void grid_move_lines(struct grid *, u_int, u_int, u_int);
void grid_move_cells(struct grid *, u_int, u_int, u_int, u_int);
char *grid_string_cells(struct grid *, u_int, u_int, u_int,
- struct grid_cell **, int);
+ struct grid_cell **, int, int);
void grid_duplicate_lines(
struct grid *, u_int, struct grid *, u_int, u_int);
u_int grid_reflow(struct grid *, struct grid *, u_int);