From 97174632dc37919396e5b0d049b33c45819d5f93 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Tue, 6 Mar 2012 11:14:51 +0000 Subject: [PATCH] Add explicit default value for NICK_COMPLETION_CHAR. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@160 13b04d17-f746-0410-82c6-800466cd88b0 --- include/config.h | 1 + source/input.c | 4 +++- source/vars.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/config.h b/include/config.h index 7c6c5b5..10c1658 100644 --- a/include/config.h +++ b/include/config.h @@ -421,6 +421,7 @@ #define DEFAULT_HTTP_GRAB OFF #define DEFAULT_HELP_WINDOW OFF #define DEFAULT_NICK_COMPLETION ON +#define DEFAULT_NICK_COMPLETION_CHAR ':' #define DEFAULT_NICK_COMPLETION_LEN 2 #define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */ #define DEFAULT_NOTIFY ON diff --git a/source/input.c b/source/input.c index aa69b3b..036d51a 100644 --- a/source/input.c +++ b/source/input.c @@ -1193,8 +1193,10 @@ BUILT_IN_KEYBINDING(send_line) { char auto_comp_char; char *p; + + /* this is for people with old BitchX.sav files that set it to '\0' */ if (!(auto_comp_char = (char)get_int_var(NICK_COMPLETION_CHAR_VAR))) - auto_comp_char = ':'; + auto_comp_char = DEFAULT_NICK_COMPLETION_CHAR; /* possible nick completion */ if ((p = strchr(tmp, auto_comp_char)) && do_hook(NICK_COMP_LIST, "%s", line)) diff --git a/source/vars.c b/source/vars.c index 0577920..110e471 100644 --- a/source/vars.c +++ b/source/vars.c @@ -311,7 +311,7 @@ static IrcVariable irc_variable[] = { "NICKLIST",0, INT_TYPE_VAR, DEFAULT_NICKLIST, NULL, NULL, 0, VIF_BITCHX }, { "NICKLIST_SORT",0, INT_TYPE_VAR, DEFAULT_NICKLIST_SORT, NULL, NULL, 0, VIF_BITCHX }, { "NICK_COMPLETION",0, BOOL_TYPE_VAR, DEFAULT_NICK_COMPLETION, NULL, NULL, 0, VIF_BITCHX }, - { "NICK_COMPLETION_CHAR",0, CHAR_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, + { "NICK_COMPLETION_CHAR",0, CHAR_TYPE_VAR, DEFAULT_NICK_COMPLETION_CHAR, NULL, NULL, 0, VIF_BITCHX }, { "NICK_COMPLETION_LEN",0, INT_TYPE_VAR, DEFAULT_NICK_COMPLETION_LEN, NULL, NULL, 0, VIF_BITCHX }, { "NICK_COMPLETION_TYPE",0, INT_TYPE_VAR, DEFAULT_NICK_COMPLETION_TYPE, NULL, NULL, 0, VIF_BITCHX }, { "NOTIFY",0, BOOL_TYPE_VAR, DEFAULT_NOTIFY, NULL, NULL, 0, VIF_BITCHX },