src/usr.bin/tmux/tmux.c - diff

Return to tmux.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/tmux.c between version 1.93 and 1.94

version 1.93, 2010/11/11 21:06:09

version 1.94, 2010/11/29 19:45:58

Line 231

struct options *oo, *so, *wo;

struct keylist *keylist;

char *s, *path, *label, *home, **var;

int opt, flags, quiet = 0;

int opt, flags, quiet, keys;

#ifdef DEBUG

malloc_options = (char *) "AFGJPX";

#endif

flags = 0;

quiet = flags = 0;

label = path = NULL;

login_shell = (**argv == '-');

while ((opt = getopt(argc, argv, "28c:df:lL:qS:uUv")) != -1) {

Line 359

options_set_number(so, "status-fg", 0);

options_set_number(so, "status-interval", 15);

options_set_number(so, "status-justify", 0);

options_set_number(so, "status-keys", MODEKEY_EMACS);

options_set_string(so, "status-left", "[#S]");

options_set_number(so, "status-left-attr", 0);

options_set_number(so, "status-left-bg", 8);

Line 400

Line 399

options_set_number(wo, "mode-attr", 0);

options_set_number(wo, "mode-bg", 3);

options_set_number(wo, "mode-fg", 0);

options_set_number(wo, "mode-keys", MODEKEY_EMACS);

options_set_number(wo, "mode-mouse", 0);

options_set_number(wo, "monitor-activity", 0);

options_set_string(wo, "monitor-content", "%s", "");

Line 427

Line 425

options_set_number(so, "status-utf8", 0);

options_set_number(wo, "utf8", 0);

}

keys = MODEKEY_EMACS;

if ((s = getenv("VISUAL")) != NULL || (s = getenv("EDITOR")) != NULL) {

if (strrchr(s, '/') != NULL)

s = strrchr(s, '/') + 1;

if (strstr(s, "vi") != NULL)

keys = MODEKEY_VI;

}

options_set_number(so, "status-keys", keys);

options_set_number(wo, "mode-keys", keys);

/* Locate the configuration file. */

if (cfg_file == NULL) {