summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--src/plugins/irc/irc-color.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 9723c27cb..c648dcef9 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -35,6 +35,7 @@ Bug fixes::
* core: fix forced highlight on messages sent to other buffers (issue #1277)
* buflist: add alternate key codes for kbd:[F1]/kbd:[F2] and kbd:[Alt+F1]/kbd:[Alt+F2] (compatibility with terminals)
* buflist: fix warning displayed when script buffers.pl is loaded (issue #1274)
+ * irc: return IRC color code instead of WeeChat color code when decoding a too short ANSI color sequence
* irc: fix encoding of italic attribute when colors are removed
* irc: fix parsing of "time" message tag on FreeBSD (issue #1289)
* relay: fix memory leak in connection of client
diff --git a/src/plugins/irc/irc-color.c b/src/plugins/irc/irc-color.c
index 240c7a58c..dacfc4219 100644
--- a/src/plugins/irc/irc-color.c
+++ b/src/plugins/irc/irc-color.c
@@ -486,7 +486,7 @@ irc_color_decode_ansi_cb (void *data, const char *text)
/* sequence "\33[m" resets color */
if (length < 4)
- return strdup (weechat_color ("reset"));
+ return strdup (IRC_COLOR_RESET_STR);
text2 = NULL;
items = NULL;