aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-02-08 18:10:07 +0000
committerTiago Cunha <tcunha@gmx.com>2010-02-08 18:10:07 +0000
commita32d095c97177eaa7ba7d2a3c723df1b878e9922 (patch)
treee67b2e8974142e2eec1d28bf8d146cdba647cadd /tmux.h
parent676d0809d2ecd38df0a135d505106f53cbed17fc (diff)
downloadrtmux-a32d095c97177eaa7ba7d2a3c723df1b878e9922.tar.gz
rtmux-a32d095c97177eaa7ba7d2a3c723df1b878e9922.tar.bz2
rtmux-a32d095c97177eaa7ba7d2a3c723df1b878e9922.zip
Sync OpenBSD patchset 635:
Instead of bailing out on the first configuration file error, carry on, collecting all the errors, then start with the active window in more mode displaying them.
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/tmux.h b/tmux.h
index 0e63cfdb..21de4b8e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.540 2010-02-05 01:34:08 tcunha Exp $ */
+/* $Id: tmux.h,v 1.541 2010-02-08 18:10:07 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1256,7 +1256,11 @@ int checkshell(const char *);
int areshell(const char *);
/* cfg.c */
-int load_cfg(const char *, struct cmd_ctx *, char **);
+extern int cfg_finished;
+extern char **cfg_causes;
+extern u_int cfg_ncauses;
+void printflike3 cfg_add_cause(u_int *, char ***, const char *, ...);
+int load_cfg(const char *, struct cmd_ctx *, u_int *, char ***);
/* mode-key.c */
extern const struct mode_key_table mode_key_tables[];
@@ -1866,6 +1870,7 @@ void window_copy_pageup(struct window_pane *);
/* window-more.c */
extern const struct window_mode window_more_mode;
+void window_more_add(struct window_pane *, const char *, ...);
void window_more_vadd(struct window_pane *, const char *, va_list);
/* window-choose.c */