Merge branch 'master' into openpgp

This commit is contained in:
James Booth
2015-06-02 20:32:07 +01:00
13 changed files with 60 additions and 13 deletions

View File

@@ -684,6 +684,14 @@ static struct cmd_t command_defs[] =
"Enable or disable word wrapping in the main window.",
NULL } } },
{ "/winstidy",
cmd_winstidy, parse_args, 1, 1, &cons_winstidy_setting,
{ "/winstidy on|off", "Auto tidy windows.",
{ "/winstidy on|off",
"----------------",
"Enable or disable auto window tidy.",
NULL } } },
{ "/time",
cmd_time, parse_args, 1, 2, &cons_time_setting,
{ "/time setting|statusbar [setting]", "Time display.",
@@ -1941,7 +1949,7 @@ _cmd_complete_parameters(const char * const input)
// autocomplete boolean settings
gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype",
"/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history",
"/vercheck", "/privileges", "/presence", "/wrap", "/carbons" };
"/vercheck", "/privileges", "/presence", "/wrap", "/winstidy", "/carbons" };
for (i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
result = autocomplete_param_with_func(input, boolean_choices[i], prefs_autocomplete_boolean_choice);