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
This commit is contained in:
Kevin Easton
2012-03-06 11:14:51 +00:00
parent a9e1608865
commit 97174632dc
3 changed files with 5 additions and 2 deletions

View File

@@ -421,6 +421,7 @@
#define DEFAULT_HTTP_GRAB OFF #define DEFAULT_HTTP_GRAB OFF
#define DEFAULT_HELP_WINDOW OFF #define DEFAULT_HELP_WINDOW OFF
#define DEFAULT_NICK_COMPLETION ON #define DEFAULT_NICK_COMPLETION ON
#define DEFAULT_NICK_COMPLETION_CHAR ':'
#define DEFAULT_NICK_COMPLETION_LEN 2 #define DEFAULT_NICK_COMPLETION_LEN 2
#define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */ #define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */
#define DEFAULT_NOTIFY ON #define DEFAULT_NOTIFY ON

View File

@@ -1193,8 +1193,10 @@ BUILT_IN_KEYBINDING(send_line)
{ {
char auto_comp_char; char auto_comp_char;
char *p; 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))) 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 */ /* possible nick completion */
if ((p = strchr(tmp, auto_comp_char)) && do_hook(NICK_COMP_LIST, "%s", line)) if ((p = strchr(tmp, auto_comp_char)) && do_hook(NICK_COMP_LIST, "%s", line))

View File

@@ -311,7 +311,7 @@ static IrcVariable irc_variable[] =
{ "NICKLIST",0, INT_TYPE_VAR, DEFAULT_NICKLIST, NULL, NULL, 0, VIF_BITCHX }, { "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 }, { "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",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_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 }, { "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 }, { "NOTIFY",0, BOOL_TYPE_VAR, DEFAULT_NOTIFY, NULL, NULL, 0, VIF_BITCHX },