From 9e4602360ac9416ce8ca4b7799d164b40c709cca Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Sat, 9 Apr 2016 00:36:08 +1000 Subject: [PATCH] Remove the extra space from default SERVER_NOTICE format Remove the extra space in the default /fset SERVER_NOTICE, and similarly the extra space in the HUMBLE /set SERVER_PROMPT. The code in the client always _intended_ to add a space between SERVER_PROMPT and SERVER_NOTICE_FSET but a bug in 75p3 and below meant it that it didn't. This bug was fixed in 1.0b but the formats were never updated. Also remove replace the embedded ANSI in the default SERVER_PROMPT with % color code. --- Changelog | 2 ++ include/color.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 85aab1a..1ad1599 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ [Changes 1.2.2] +* Update default /fset SERVER_NOTICE value to remove extra space. (caf) + * Treat all NOTICEs before registration as local server notices. (caf) * Add /on NOTICE_GROUP and /fset NOTICE_GROUP analogous to MSG_GROUP. (caf) diff --git a/include/color.h b/include/color.h index ccfbb49..588ee46 100644 --- a/include/color.h +++ b/include/color.h @@ -446,7 +446,7 @@ #endif -#define DEFAULT_SERVER_PROMPT "%K[%c$0%K] " +#define DEFAULT_SERVER_PROMPT "%K[%c$0%K]" #define DEFAULT_FORMAT_WATCH_SIGNOFF_FSET "$G $0!$1@$2 has signed off" #define DEFAULT_FORMAT_WATCH_SIGNON_FSET "$G $0!$1@$2 has signed on $3" @@ -655,7 +655,7 @@ #define DEFAULT_FORMAT_SERVER_MSG2_FSET "$G%n $1-" #define DEFAULT_FORMAT_SERVER_MSG2_FROM_FSET "$G%n $1-" -#define DEFAULT_FORMAT_SERVER_NOTICE_FSET " $2-" +#define DEFAULT_FORMAT_SERVER_NOTICE_FSET "$2-" #define DEFAULT_FORMAT_SERVER_NOTICE_BOT_FSET " Possible bot: %C$1 %K[%c$2-%K]%n" #define DEFAULT_FORMAT_SERVER_NOTICE_BOT1_FSET " Possible $1 bot: %C$2 %K[%c$3-%K]%n" #define DEFAULT_FORMAT_SERVER_NOTICE_BOT_ALARM_FSET " $1 alarm activated: %C$2 %K[%c$3-%K]%n" @@ -893,7 +893,7 @@ #endif #endif -#define DEFAULT_SERVER_PROMPT "[$0]" +#define DEFAULT_SERVER_PROMPT "%G[$0]" #define DEFAULT_FORMAT_WATCH_SIGNOFF_FSET "$G $0!$1@$2 has signed off" #define DEFAULT_FORMAT_WATCH_SIGNON_FSET "$G $0!$1@$2 has signed on $3"