1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-08 04:36:35 +01:00

merge wit upstream

This commit is contained in:
Jfreegman
2015-03-11 18:52:28 -04:00
16 changed files with 569 additions and 35 deletions

View File

@@ -58,6 +58,7 @@
#include "device.h"
#include "message_queue.h"
#include "execute.h"
#include "term_mplex.h"
#ifdef X11
#include "xtra.h"
@@ -1121,6 +1122,10 @@ int main(int argc, char *argv[])
if (settings_err == -1)
queue_init_message("Failed to load user settings");
/* screen/tmux auto-away timer */
if (init_mplex_away_timer (m) == -1)
queue_init_message("Failed to init mplex auto-away.");
load_groups(m);
print_init_messages(prompt);
cleanup_init_messages();