plugins: sort options added in configuration sections

12 files changed, 175 insertions, 175 deletions

diff --git a/src/plugins/buflist/buflist-config.c b/src/plugins/buflist/buflist-config.c
index 148b0fbd6..f695405fd 100644
--- a/src/plugins/buflist/buflist-config.c
+++ b/src/plugins/buflist/buflist-config.c
@@ -473,6 +473,15 @@ buflist_config_init ()
         NULL, NULL, NULL,
         NULL, NULL, NULL,
         NULL, NULL, NULL);
+    buflist_config_look_mouse_wheel = weechat_config_new_option (
+        buflist_config_file, ptr_section,
+        "mouse_wheel", "boolean",
+        N_("if enabled, mouse wheel up/down actions jump to previous/next "
+           "buffer in list"),
+        NULL, 0, 0, "on", NULL, 0,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL);
     buflist_config_look_nick_prefix = weechat_config_new_option (
         buflist_config_file, ptr_section,
         "nick_prefix", "boolean",
@@ -493,15 +502,6 @@ buflist_config_init ()
         NULL, NULL, NULL,
         &buflist_config_change_buflist, NULL, NULL,
         NULL, NULL, NULL);
-    buflist_config_look_mouse_wheel = weechat_config_new_option (
-        buflist_config_file, ptr_section,
-        "mouse_wheel", "boolean",
-        N_("if enabled, mouse wheel up/down actions jump to previous/next "
-           "buffer in list"),
-        NULL, 0, 0, "on", NULL, 0,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL);
     buflist_config_look_signals_refresh = weechat_config_new_option (
         buflist_config_file, ptr_section,
         "signals_refresh", "string",
@@ -581,6 +581,15 @@ buflist_config_init ()
         NULL, NULL, NULL,
         &buflist_config_change_format, NULL, NULL,
         NULL, NULL, NULL);
+    buflist_config_format_hotlist_level[3] = weechat_config_new_option (
+        buflist_config_file, ptr_section,
+        "hotlist_highlight", "string",
+        N_("format for a buffer with hotlist level \"highlight\" "
+           "(note: content is evaluated, see /help buflist)"),
+        NULL, 0, 0, "${color:magenta}", NULL, 0,
+        NULL, NULL, NULL,
+        &buflist_config_change_buflist, NULL, NULL,
+        NULL, NULL, NULL);
     buflist_config_format_hotlist_level[0] = weechat_config_new_option (
         buflist_config_file, ptr_section,
         "hotlist_low", "string",
@@ -599,30 +608,21 @@ buflist_config_init ()
         NULL, NULL, NULL,
         &buflist_config_change_buflist, NULL, NULL,
         NULL, NULL, NULL);
-    buflist_config_format_hotlist_level[2] = weechat_config_new_option (
-        buflist_config_file, ptr_section,
-        "hotlist_private", "string",
-        N_("format for a buffer with hotlist level \"private\" "
-           "(note: content is evaluated, see /help buflist)"),
-        NULL, 0, 0, "${color:green}", NULL, 0,
-        NULL, NULL, NULL,
-        &buflist_config_change_buflist, NULL, NULL,
-        NULL, NULL, NULL);
-    buflist_config_format_hotlist_level[3] = weechat_config_new_option (
+    buflist_config_format_hotlist_level_none = weechat_config_new_option (
         buflist_config_file, ptr_section,
-        "hotlist_highlight", "string",
-        N_("format for a buffer with hotlist level \"highlight\" "
+        "hotlist_none", "string",
+        N_("format for a buffer not in hotlist "
            "(note: content is evaluated, see /help buflist)"),
-        NULL, 0, 0, "${color:magenta}", NULL, 0,
+        NULL, 0, 0, "${color:default}", NULL, 0,
         NULL, NULL, NULL,
         &buflist_config_change_buflist, NULL, NULL,
         NULL, NULL, NULL);
-    buflist_config_format_hotlist_level_none = weechat_config_new_option (
+    buflist_config_format_hotlist_level[2] = weechat_config_new_option (
         buflist_config_file, ptr_section,
-        "hotlist_none", "string",
-        N_("format for a buffer not in hotlist "
+        "hotlist_private", "string",
+        N_("format for a buffer with hotlist level \"private\" "
            "(note: content is evaluated, see /help buflist)"),
-        NULL, 0, 0, "${color:default}", NULL, 0,
+        NULL, 0, 0, "${color:green}", NULL, 0,
         NULL, NULL, NULL,
         &buflist_config_change_buflist, NULL, NULL,
         NULL, NULL, NULL);
diff --git a/src/plugins/exec/exec-config.c b/src/plugins/exec/exec-config.c
index 227155af1..6ea68a56d 100644
--- a/src/plugins/exec/exec-config.c
+++ b/src/plugins/exec/exec-config.c
@@ -38,8 +38,8 @@ struct t_config_option *exec_config_command_shell;
 
 /* exec config, color section */
 
-struct t_config_option *exec_config_color_flag_running;
 struct t_config_option *exec_config_color_flag_finished;
+struct t_config_option *exec_config_color_flag_running;
 
 char **exec_config_cmd_options = NULL;
 int exec_config_cmd_num_options = 0;
@@ -164,18 +164,18 @@ exec_config_init ()
         return 0;
     }
 
-    exec_config_color_flag_running = weechat_config_new_option (
-        exec_config_file, ptr_section,
-        "flag_running", "color",
-        N_("text color for a running command flag in list of commands"),
-        NULL, 0, 0, "lightgreen", NULL, 0,
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     exec_config_color_flag_finished = weechat_config_new_option (
         exec_config_file, ptr_section,
         "flag_finished", "color",
         N_("text color for a finished command flag in list of commands"),
         NULL, 0, 0, "lightred", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    exec_config_color_flag_running = weechat_config_new_option (
+        exec_config_file, ptr_section,
+        "flag_running", "color",
+        N_("text color for a running command flag in list of commands"),
+        NULL, 0, 0, "lightgreen", NULL, 0,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
     return 1;
 }
diff --git a/src/plugins/exec/exec-config.h b/src/plugins/exec/exec-config.h
index f6ef639c7..8467d9cc9 100644
--- a/src/plugins/exec/exec-config.h
+++ b/src/plugins/exec/exec-config.h
@@ -28,8 +28,8 @@ extern struct t_config_option *exec_config_command_default_options;
 extern struct t_config_option *exec_config_command_purge_delay;
 extern struct t_config_option *exec_config_command_shell;
 
-extern struct t_config_option *exec_config_color_flag_running;
 extern struct t_config_option *exec_config_color_flag_finished;
+extern struct t_config_option *exec_config_color_flag_running;
 
 extern char **exec_config_cmd_options;
 extern int exec_config_cmd_num_options;
diff --git a/src/plugins/fset/fset-config.c b/src/plugins/fset/fset-config.c
index 66e8f16b9..29c8cfb73 100644
--- a/src/plugins/fset/fset-config.c
+++ b/src/plugins/fset/fset-config.c
@@ -49,10 +49,10 @@ struct t_config_option *fset_config_look_use_mute;
 
 /* fset config, format section */
 
-struct t_config_option *fset_config_format_option[2];
 struct t_config_option *fset_config_format_export_help;
 struct t_config_option *fset_config_format_export_option;
 struct t_config_option *fset_config_format_export_option_null;
+struct t_config_option *fset_config_format_option[2];
 
 /* fset config, color section */
 
@@ -462,6 +462,39 @@ fset_config_init ()
         return 0;
     }
 
+    fset_config_format_export_help = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "export_help", "string",
+        N_("format of help line written before each option exported in a file "
+           "(note: content is evaluated, see /help fset)"),
+        NULL, 0, 0,
+        "# ${description2}",
+        NULL, 0,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL);
+    fset_config_format_export_option = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "export_option", "string",
+        N_("format of each option exported in a file "
+           "(note: content is evaluated, see /help fset)"),
+        NULL, 0, 0,
+        "/set ${name} ${quoted_value}",
+        NULL, 0,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL);
+    fset_config_format_export_option_null = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "export_option_null", "string",
+        N_("format of each option with \"null\" value exported in a file "
+           "(note: content is evaluated, see /help fset)"),
+        NULL, 0, 0,
+        "/unset ${name}",
+        NULL, 0,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL);
     fset_config_format_option[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "option1", "string",
@@ -497,39 +530,6 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_format_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_format_export_help = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "export_help", "string",
-        N_("format of help line written before each option exported in a file "
-           "(note: content is evaluated, see /help fset)"),
-        NULL, 0, 0,
-        "# ${description2}",
-        NULL, 0,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL);
-    fset_config_format_export_option = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "export_option", "string",
-        N_("format of each option exported in a file "
-           "(note: content is evaluated, see /help fset)"),
-        NULL, 0, 0,
-        "/set ${name} ${quoted_value}",
-        NULL, 0,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL);
-    fset_config_format_export_option_null = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "export_option_null", "string",
-        N_("format of each option with \"null\" value exported in a file "
-           "(note: content is evaluated, see /help fset)"),
-        NULL, 0, 0,
-        "/unset ${name}",
-        NULL, 0,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL,
-        NULL, NULL, NULL);
 
     /* color */
     ptr_section = weechat_config_new_section (fset_config_file, "color",
@@ -586,14 +586,6 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_file[1] = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "file_selected", "color",
-        N_("color for file on the selected line"),
-        NULL, 0, 0, "white", NULL, 0,
-        NULL, NULL, NULL,
-        &fset_config_change_color_cb, NULL, NULL,
-        NULL, NULL, NULL);
     fset_config_color_file_changed[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "file_changed", "color",
@@ -610,6 +602,14 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
+    fset_config_color_file[1] = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "file_selected", "color",
+        N_("color for file on the selected line"),
+        NULL, 0, 0, "white", NULL, 0,
+        NULL, NULL, NULL,
+        &fset_config_change_color_cb, NULL, NULL,
+        NULL, NULL, NULL);
     fset_config_color_help_default_value = weechat_config_new_option (
         fset_config_file, ptr_section,
         "help_default_value", "color",
@@ -758,14 +758,6 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_name[1] = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "name_selected", "color",
-        N_("color for name on the selected line"),
-        NULL, 0, 0, "white", NULL, 0,
-        NULL, NULL, NULL,
-        &fset_config_change_color_cb, NULL, NULL,
-        NULL, NULL, NULL);
     fset_config_color_name_changed[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "name_changed", "color",
@@ -782,19 +774,19 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_option[0] = weechat_config_new_option (
+    fset_config_color_name[1] = weechat_config_new_option (
         fset_config_file, ptr_section,
-        "option", "color",
-        N_("color for option"),
-        NULL, 0, 0, "default", NULL, 0,
+        "name_selected", "color",
+        N_("color for name on the selected line"),
+        NULL, 0, 0, "white", NULL, 0,
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_option[1] = weechat_config_new_option (
+    fset_config_color_option[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
-        "option_selected", "color",
-        N_("color for option on the selected line"),
-        NULL, 0, 0, "white", NULL, 0,
+        "option", "color",
+        N_("color for option"),
+        NULL, 0, 0, "default", NULL, 0,
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
@@ -814,7 +806,15 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-   fset_config_color_parent_name[0] = weechat_config_new_option (
+    fset_config_color_option[1] = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "option_selected", "color",
+        N_("color for option on the selected line"),
+        NULL, 0, 0, "white", NULL, 0,
+        NULL, NULL, NULL,
+        &fset_config_change_color_cb, NULL, NULL,
+        NULL, NULL, NULL);
+    fset_config_color_parent_name[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "parent_name", "color",
         N_("color for name of parent option"),
@@ -854,14 +854,6 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_quotes[1] = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "quotes_selected", "color",
-        N_("color for quotes around string values on the selected line"),
-        NULL, 0, 0, "default", NULL, 0,
-        NULL, NULL, NULL,
-        &fset_config_change_color_cb, NULL, NULL,
-        NULL, NULL, NULL);
     fset_config_color_quotes_changed[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "quotes_changed", "color",
@@ -879,19 +871,19 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_section[0] = weechat_config_new_option (
+    fset_config_color_quotes[1] = weechat_config_new_option (
         fset_config_file, ptr_section,
-        "section", "color",
-        N_("color for section"),
+        "quotes_selected", "color",
+        N_("color for quotes around string values on the selected line"),
         NULL, 0, 0, "default", NULL, 0,
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_section[1] = weechat_config_new_option (
+    fset_config_color_section[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
-        "section_selected", "color",
-        N_("color for section on the selected line"),
-        NULL, 0, 0, "white", NULL, 0,
+        "section", "color",
+        N_("color for section"),
+        NULL, 0, 0, "default", NULL, 0,
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
@@ -911,6 +903,14 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
+    fset_config_color_section[1] = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "section_selected", "color",
+        N_("color for section on the selected line"),
+        NULL, 0, 0, "white", NULL, 0,
+        NULL, NULL, NULL,
+        &fset_config_change_color_cb, NULL, NULL,
+        NULL, NULL, NULL);
     fset_config_color_string_values[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "string_values", "color",
@@ -1009,14 +1009,6 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
-    fset_config_color_value[1] = weechat_config_new_option (
-        fset_config_file, ptr_section,
-        "value_selected", "color",
-        N_("color for value on the selected line"),
-        NULL, 0, 0, "lightcyan", NULL, 0,
-        NULL, NULL, NULL,
-        &fset_config_change_color_cb, NULL, NULL,
-        NULL, NULL, NULL);
     fset_config_color_value_changed[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "value_changed", "color",
@@ -1034,6 +1026,14 @@ fset_config_init ()
         NULL, NULL, NULL,
         &fset_config_change_color_cb, NULL, NULL,
         NULL, NULL, NULL);
+    fset_config_color_value[1] = weechat_config_new_option (
+        fset_config_file, ptr_section,
+        "value_selected", "color",
+        N_("color for value on the selected line"),
+        NULL, 0, 0, "lightcyan", NULL, 0,
+        NULL, NULL, NULL,
+        &fset_config_change_color_cb, NULL, NULL,
+        NULL, NULL, NULL);
     fset_config_color_value_undef[0] = weechat_config_new_option (
         fset_config_file, ptr_section,
         "value_undef", "color",
diff --git a/src/plugins/fset/fset-config.h b/src/plugins/fset/fset-config.h
index e9e1fe4bb..149d3f784 100644
--- a/src/plugins/fset/fset-config.h
+++ b/src/plugins/fset/fset-config.h
@@ -37,10 +37,10 @@ extern struct t_config_option *fset_config_look_use_color_value;
 extern struct t_config_option *fset_config_look_use_keys;
 extern struct t_config_option *fset_config_look_use_mute;
 
-extern struct t_config_option *fset_config_format_option[2];
 extern struct t_config_option *fset_config_format_export_help;
 extern struct t_config_option *fset_config_format_export_option;
 extern struct t_config_option *fset_config_format_export_option_null;
+extern struct t_config_option *fset_config_format_option[2];
 
 extern struct t_config_option *fset_config_color_default_value[2];
 extern struct t_config_option *fset_config_color_description[2];
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index dd18a268c..f46b5de5c 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -115,8 +115,8 @@ struct t_config_option *irc_config_color_item_channel_modes;
 struct t_config_option *irc_config_color_item_lag_counting;
 struct t_config_option *irc_config_color_item_lag_finished;
 struct t_config_option *irc_config_color_item_nick_modes;
-struct t_config_option *irc_config_color_message_join;
 struct t_config_option *irc_config_color_message_chghost;
+struct t_config_option *irc_config_color_message_join;
 struct t_config_option *irc_config_color_message_kick;
 struct t_config_option *irc_config_color_message_quit;
 struct t_config_option *irc_config_color_mirc_remap;
@@ -3203,18 +3203,18 @@ irc_config_init ()
         NULL, NULL, NULL,
         &irc_config_change_color_item_nick_modes, NULL, NULL,
         NULL, NULL, NULL);
-    irc_config_color_message_join = weechat_config_new_option (
-        irc_config_file, ptr_section,
-        "message_join", "color",
-        N_("color for text in join messages"),
-        NULL, -1, 0, "green", NULL, 0,
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     irc_config_color_message_chghost = weechat_config_new_option (
         irc_config_file, ptr_section,
         "message_chghost", "color",
         N_("color for text in chghost messages"),
         NULL, -1, 0, "brown", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    irc_config_color_message_join = weechat_config_new_option (
+        irc_config_file, ptr_section,
+        "message_join", "color",
+        N_("color for text in join messages"),
+        NULL, -1, 0, "green", NULL, 0,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     irc_config_color_message_kick = weechat_config_new_option (
         irc_config_file, ptr_section,
         "message_kick", "color",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index d8712e362..1de03a209 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -153,8 +153,8 @@ extern struct t_config_option *irc_config_color_item_channel_modes;
 extern struct t_config_option *irc_config_color_item_lag_counting;
 extern struct t_config_option *irc_config_color_item_lag_finished;
 extern struct t_config_option *irc_config_color_item_nick_modes;
-extern struct t_config_option *irc_config_color_message_join;
 extern struct t_config_option *irc_config_color_message_chghost;
+extern struct t_config_option *irc_config_color_message_join;
 extern struct t_config_option *irc_config_color_message_kick;
 extern struct t_config_option *irc_config_color_message_quit;
 extern struct t_config_option *irc_config_color_mirc_remap;
diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c
index 6cd92344e..53c7a1e9a 100644
--- a/src/plugins/relay/relay-config.c
+++ b/src/plugins/relay/relay-config.c
@@ -933,22 +933,6 @@ relay_config_init ()
         N_("text color for client description"),
         NULL, 0, 0, "cyan", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-    relay_config_color_status[RELAY_STATUS_CONNECTING] = weechat_config_new_option (
-        relay_config_file, ptr_section,
-        "status_connecting", "color",
-        N_("text color for \"connecting\" status"),
-        NULL, 0, 0, "yellow", NULL, 0,
-        NULL, NULL, NULL,
-        &relay_config_refresh_cb, NULL, NULL,
-        NULL, NULL, NULL);
-    relay_config_color_status[RELAY_STATUS_WAITING_AUTH] = weechat_config_new_option (
-        relay_config_file, ptr_section,
-        "status_waiting_auth", "color",
-        N_("text color for \"waiting authentication\" status"),
-        NULL, 0, 0, "brown", NULL, 0,
-        NULL, NULL, NULL,
-        &relay_config_refresh_cb, NULL, NULL,
-        NULL, NULL, NULL);
     relay_config_color_status[RELAY_STATUS_CONNECTED] = weechat_config_new_option (
         relay_config_file, ptr_section,
         "status_active", "color",
@@ -965,6 +949,14 @@ relay_config_init ()
         NULL, NULL, NULL,
         &relay_config_refresh_cb, NULL, NULL,
         NULL, NULL, NULL);
+    relay_config_color_status[RELAY_STATUS_CONNECTING] = weechat_config_new_option (
+        relay_config_file, ptr_section,
+        "status_connecting", "color",
+        N_("text color for \"connecting\" status"),
+        NULL, 0, 0, "yellow", NULL, 0,
+        NULL, NULL, NULL,
+        &relay_config_refresh_cb, NULL, NULL,
+        NULL, NULL, NULL);
     relay_config_color_status[RELAY_STATUS_DISCONNECTED] = weechat_config_new_option (
         relay_config_file, ptr_section,
         "status_disconnected", "color",
@@ -973,6 +965,14 @@ relay_config_init ()
         NULL, NULL, NULL,
         &relay_config_refresh_cb, NULL, NULL,
         NULL, NULL, NULL);
+    relay_config_color_status[RELAY_STATUS_WAITING_AUTH] = weechat_config_new_option (
+        relay_config_file, ptr_section,
+        "status_waiting_auth", "color",
+        N_("text color for \"waiting authentication\" status"),
+        NULL, 0, 0, "brown", NULL, 0,
+        NULL, NULL, NULL,
+        &relay_config_refresh_cb, NULL, NULL,
+        NULL, NULL, NULL);
     relay_config_color_text = weechat_config_new_option (
         relay_config_file, ptr_section,
         "text", "color",
diff --git a/src/plugins/script/script-config.c b/src/plugins/script/script-config.c
index 88c04a169..1acff6bdf 100644
--- a/src/plugins/script/script-config.c
+++ b/src/plugins/script/script-config.c
@@ -80,8 +80,8 @@ struct t_config_option *script_config_color_text_version_selected;
 struct t_config_option *script_config_scripts_autoload;
 struct t_config_option *script_config_scripts_cache_expire;
 struct t_config_option *script_config_scripts_download_timeout;
-struct t_config_option *script_config_scripts_path;
 struct t_config_option *script_config_scripts_hold;
+struct t_config_option *script_config_scripts_path;
 struct t_config_option *script_config_scripts_url;
 
 
@@ -759,14 +759,6 @@ script_config_init ()
         N_("timeout (in seconds) for download of scripts and list of scripts"),
         NULL, 1, 3600, "30", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-    script_config_scripts_path = weechat_config_new_option (
-        script_config_file, ptr_section,
-        "path", "string",
-        N_("local cache directory for scripts; \"%h\" at beginning of string "
-           "is replaced by WeeChat home (\"~/.weechat\" by default) "
-           "(note: content is evaluated, see /help eval)"),
-        NULL, 0, 0, "%h/script", NULL, 0,
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     script_config_scripts_hold = weechat_config_new_option (
         script_config_file, ptr_section,
         "hold", "string",
@@ -777,6 +769,14 @@ script_config_init ()
         NULL, NULL, NULL,
         &script_config_change_hold_cb, NULL, NULL,
         NULL, NULL, NULL);
+    script_config_scripts_path = weechat_config_new_option (
+        script_config_file, ptr_section,
+        "path", "string",
+        N_("local cache directory for scripts; \"%h\" at beginning of string "
+           "is replaced by WeeChat home (\"~/.weechat\" by default) "
+           "(note: content is evaluated, see /help eval)"),
+        NULL, 0, 0, "%h/script", NULL, 0,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     script_config_scripts_url = weechat_config_new_option (
         script_config_file, ptr_section,
         "url", "string",
diff --git a/src/plugins/script/script-config.h b/src/plugins/script/script-config.h
index b1e3574e5..ae532f1c3 100644
--- a/src/plugins/script/script-config.h
+++ b/src/plugins/script/script-config.h
@@ -63,8 +63,8 @@ extern struct t_config_option *script_config_color_text_version_selected;
 extern struct t_config_option *script_config_scripts_autoload;
 extern struct t_config_option *script_config_scripts_cache_expire;
 extern struct t_config_option *script_config_scripts_download_timeout;
-extern struct t_config_option *script_config_scripts_path;
 extern struct t_config_option *script_config_scripts_hold;
+extern struct t_config_option *script_config_scripts_path;
 extern struct t_config_option *script_config_scripts_url;
 
 extern const char *script_config_get_diff_command ();
diff --git a/src/plugins/xfer/xfer-config.c b/src/plugins/xfer/xfer-config.c
index f36fb2d46..a776f9638 100644
--- a/src/plugins/xfer/xfer-config.c
+++ b/src/plugins/xfer/xfer-config.c
@@ -50,8 +50,8 @@ struct t_config_option *xfer_config_network_fast_send;
 struct t_config_option *xfer_config_network_own_ip;
 struct t_config_option *xfer_config_network_port_range;
 struct t_config_option *xfer_config_network_send_ack;
-struct t_config_option *xfer_config_network_speed_limit_send;
 struct t_config_option *xfer_config_network_speed_limit_recv;
+struct t_config_option *xfer_config_network_speed_limit_send;
 struct t_config_option *xfer_config_network_timeout;
 
 /* xfer config, file section */
@@ -170,19 +170,11 @@ xfer_config_init ()
         return 0;
     }
 
-    xfer_config_color_status[XFER_STATUS_WAITING] = weechat_config_new_option (
-        xfer_config_file, ptr_section,
-        "status_waiting", "color",
-        N_("text color for \"waiting\" status"),
-        NULL, 0, 0, "lightcyan", NULL, 0,
-        NULL, NULL, NULL,
-        &xfer_config_refresh_cb, NULL, NULL,
-        NULL, NULL, NULL);
-    xfer_config_color_status[XFER_STATUS_CONNECTING] = weechat_config_new_option (
+    xfer_config_color_status[XFER_STATUS_ABORTED] = weechat_config_new_option (
         xfer_config_file, ptr_section,
-        "status_connecting", "color",
-        N_("text color for \"connecting\" status"),
-        NULL, 0, 0, "yellow", NULL, 0,
+        "status_aborted", "color",
+        N_("text color for \"aborted\" status"),
+        NULL, 0, 0, "lightred", NULL, 0,
         NULL, NULL, NULL,
         &xfer_config_refresh_cb, NULL, NULL,
         NULL, NULL, NULL);
@@ -194,6 +186,14 @@ xfer_config_init ()
         NULL, NULL, NULL,
         &xfer_config_refresh_cb, NULL, NULL,
         NULL, NULL, NULL);
+    xfer_config_color_status[XFER_STATUS_CONNECTING] = weechat_config_new_option (
+        xfer_config_file, ptr_section,
+        "status_connecting", "color",
+        N_("text color for \"connecting\" status"),
+        NULL, 0, 0, "yellow", NULL, 0,
+        NULL, NULL, NULL,
+        &xfer_config_refresh_cb, NULL, NULL,
+        NULL, NULL, NULL);
     xfer_config_color_status[XFER_STATUS_DONE] = weechat_config_new_option (
         xfer_config_file, ptr_section,
         "status_done", "color",
@@ -210,11 +210,11 @@ xfer_config_init ()
         NULL, NULL, NULL,
         &xfer_config_refresh_cb, NULL, NULL,
         NULL, NULL, NULL);
-    xfer_config_color_status[XFER_STATUS_ABORTED] = weechat_config_new_option (
+    xfer_config_color_status[XFER_STATUS_WAITING] = weechat_config_new_option (
         xfer_config_file, ptr_section,
-        "status_aborted", "color",
-        N_("text color for \"aborted\" status"),
-        NULL, 0, 0, "lightred", NULL, 0,
+        "status_waiting", "color",
+        N_("text color for \"waiting\" status"),
+        NULL, 0, 0, "lightcyan", NULL, 0,
         NULL, NULL, NULL,
         &xfer_config_refresh_cb, NULL, NULL,
         NULL, NULL, NULL);
@@ -296,17 +296,17 @@ xfer_config_init ()
            "the acks are not sent immediately to the sender"),
         NULL, 0, 0, "on", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-    xfer_config_network_speed_limit_send = weechat_config_new_option (
+    xfer_config_network_speed_limit_recv = weechat_config_new_option (
         xfer_config_file, ptr_section,
-        "speed_limit_send", "integer",
-        N_("speed limit for sending files, in kilo-bytes by second (0 means "
+        "speed_limit_recv", "integer",
+        N_("speed limit for receiving files, in kilo-bytes by second (0 means "
            "no limit)"),
         NULL, 0, INT_MAX, "0", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-    xfer_config_network_speed_limit_recv = weechat_config_new_option (
+    xfer_config_network_speed_limit_send = weechat_config_new_option (
         xfer_config_file, ptr_section,
-        "speed_limit_recv", "integer",
-        N_("speed limit for receiving files, in kilo-bytes by second (0 means "
+        "speed_limit_send", "integer",
+        N_("speed limit for sending files, in kilo-bytes by second (0 means "
            "no limit)"),
         NULL, 0, INT_MAX, "0", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/src/plugins/xfer/xfer-config.h b/src/plugins/xfer/xfer-config.h
index edda24985..1d5d05e9a 100644
--- a/src/plugins/xfer/xfer-config.h
+++ b/src/plugins/xfer/xfer-config.h
@@ -40,8 +40,8 @@ extern struct t_config_option *xfer_config_network_fast_send;
 extern struct t_config_option *xfer_config_network_own_ip;
 extern struct t_config_option *xfer_config_network_port_range;
 extern struct t_config_option *xfer_config_network_send_ack;
-extern struct t_config_option *xfer_config_network_speed_limit_send;
 extern struct t_config_option *xfer_config_network_speed_limit_recv;
+extern struct t_config_option *xfer_config_network_speed_limit_send;
 extern struct t_config_option *xfer_config_network_timeout;
 
 extern struct t_config_option *xfer_config_file_auto_accept_chats;